[Commits] 69328c31ed3: MDEV-18176 Galera test failure on galera.galera_gtid_slave_sst_rsync

jan jan.lindstrom at mariadb.com
Tue Jan 15 13:29:14 EET 2019


revision-id: 69328c31ed31048e5f60b9e8e5a21bbe3220f968 (mariadb-10.1.37-57-g69328c31ed3)
parent(s): 7d3161def8af04690e294d87d7483d3e0d54bbce
author: mkaruza
committer: Jan Lindström
timestamp: 2019-01-15 13:29:11 +0200
message:

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.

---
 mysql-test/suite/galera/r/galera_gtid_slave_sst_rsync.result | 1 +
 mysql-test/suite/galera/t/galera_gtid_slave_sst_rsync.test   | 3 +++
 2 files changed, 4 insertions(+)

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


More information about the commits mailing list