diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-02-13 10:30:40 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-02-13 10:30:40 +0200 |
| commit | 6c1e0c0493f09205bf9cd83c51c881e06d0e1305 (patch) | |
| tree | ea589ff7293785ce9e09284177ba1c32155d8dab | |
| parent | a6b92690e612bf88b2c042b33878c04fec5c50ed (diff) | |
| download | mariadb-git-6c1e0c0493f09205bf9cd83c51c881e06d0e1305.tar.gz | |
MDEV-21421 : Galera test sporadic failure on galera.galera_as_slave_gtid_myisam: Result length mismatch
In Galera 3 nodes 2 and 3 are galera nodes and node_1 should be
non galera.
| -rw-r--r-- | mysql-test/suite/galera/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result | 3 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 6f0f1fbdde5..f7ba0b3c08c 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -15,7 +15,6 @@ MW-328A : MDEV-21483 galera.MW-328A galera.MW-328B MW-328B : MDEV-21483 galera.MW-328A galera.MW-328B MW-329 : MDEV-19962 Galera test failure on MW-329 galera.galera_defaults : MDEV-21494 Galera test sporadic failure on galera.galera_defaults -galera_as_slave_gtid_myisam : MDEV-21421 galera.galera_as_slave_gtid_myisam galera_as_slave_replication_bundle : MDEV-15785 OPTION_GTID_BEGIN is set in Gtid_log_event::do_apply_event() galera_autoinc_sst_mariabackup : Known issue, may require porting MDEV-17458 from later versions galera_binlog_stmt_autoinc : MDEV-19959 Galera test failure on galera_binlog_stmt_autoinc diff --git a/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result b/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result index 0e5c6425d6a..d8a9f0d6f57 100644 --- a/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result +++ b/mysql-test/suite/galera/r/galera_as_slave_gtid_myisam.result @@ -1,4 +1,7 @@ connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2; +SELECT @@WSREP_ON; +@@WSREP_ON +0 connection node_2; ALTER TABLE mysql.gtid_slave_pos engine = InnoDB; START SLAVE; diff --git a/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test b/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test index faa9ddfd5c8..33668da11be 100644 --- a/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test +++ b/mysql-test/suite/galera/t/galera_as_slave_gtid_myisam.test @@ -16,6 +16,7 @@ # As node #1 is not a Galera node, we connect to node #2 in order to run include/galera_cluster.inc --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 --source include/galera_cluster.inc +SELECT @@WSREP_ON; --connection node_2 # make sure gtid_slave_pos is of innodb engine, mtr does not currently provide that |