summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormkaruza <mario.karuza@galeracluster.com>2019-01-15 09:58:35 +0100
committerJan Lindström <jan.lindstrom@mariadb.com>2019-01-15 13:29:11 +0200
commit69328c31ed31048e5f60b9e8e5a21bbe3220f968 (patch)
treec5526b1c1c66e453dd05fd56eb665c85e2cc45e1
parent7d3161def8af04690e294d87d7483d3e0d54bbce (diff)
downloadmariadb-git-69328c31ed31048e5f60b9e8e5a21bbe3220f968.tar.gz
MDEV-18176 Galera test failure on galera.galera_gtid_slave_sst_rsync
If galera.galera_gtid_slave_sst_rsync is repeated more than once it will fail due incorrect GTID position. After stopping SLAVE node reset also GTID_SLAVE_POS variable.
-rw-r--r--mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result1
-rw-r--r--mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test3
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result b/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result
index 81fae57d731..7953910b385 100644
--- a/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result
+++ b/mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result
@@ -123,6 +123,7 @@ DROP TABLE t2,t1;
#Connection 2
STOP SLAVE;
RESET SLAVE ALL;
+set global gtid_slave_pos="";
reset master;
#Connection 3
reset master;
diff --git a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
index 3fe94ad16b7..3ed7ec1d09e 100644
--- a/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
+++ b/mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test
@@ -196,6 +196,9 @@ DROP TABLE t2,t1;
--connection node_2
STOP SLAVE;
RESET SLAVE ALL;
+--disable_warnings
+set global gtid_slave_pos="";
+--enable_warnings
reset master;
--echo #Connection 3