rdbms: ignore inactive mysql GTIDs in replication position methods

[lhc/web/wiklou.git] / tests / phpunit / includes / libs / rdbms / database / DatabaseMysqlBaseTest.php

diff --git a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php b/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
index a4edbe7..b74a372 100644 (file)
--- a/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
+++ b/tests/phpunit/includes/libs/rdbms/database/DatabaseMysqlBaseTest.php
@@ -456,12 +456,15 @@ class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase {
                                        'gtid_binlog_pos' => '100-13-77',
                                        'gtid_slave_pos' => null // master
                                ],
-                               [],
+                               [
+                                       'Relay_Master_Log_File' => 'host.1600',
+                                       'Exec_Master_Log_Pos' => '77'
+                               ],
                                [
                                        'File' => 'host.1600',
-                                       'Pos' => '77'
+                                       'Position' => '77'
                                ],
-                               [ '100' => '100-13-77' ],
+                               [],
                                [ '100' => '100-13-77' ]
                        ],
                        [
@@ -527,7 +530,8 @@ class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase {
                        ],
                        [
                                [
-                                       'gtid_executed' => null // not enabled?
+                                       'gtid_executed' => null, // not enabled?
+                                       'gtid_binlog_pos' => null
                                ],
                                [
                                        'Relay_Master_Log_File' => 'host.1600',
@@ -539,7 +543,8 @@ class DatabaseMysqlBaseTest extends PHPUnit\Framework\TestCase {
                        ],
                        [
                                [
-                                       'gtid_executed' => null // not enabled?
+                                       'gtid_executed' => null, // not enabled?
+                                       'gtid_binlog_pos' => null
                                ],
                                [], // no replication
                                [], // no replication