summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2019-10-09 11:42:50 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2019-10-09 11:42:50 +0300
commit62dce14d156ff99836a23f5ccadcfaa19cf11f8a (patch)
treea78c97e249a77d838fb2ea5937cac1cb6466dd87
parent44a11a7c085f4f5a4042100df0828d54d596103d (diff)
downloadmariadb-git-62dce14d156ff99836a23f5ccadcfaa19cf11f8a.tar.gz
MDEV-20782 : Galera test failure on galera_sr.galera_sr_mysqldump_sst
Add auto increment offset save and restore as node(s) are restarted.
-rw-r--r--mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result2
-rw-r--r--mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test8
2 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result b/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
index df454772346..6789990f18e 100644
--- a/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
+++ b/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
@@ -10,6 +10,8 @@ SET GLOBAL wsrep_sst_auth = 'sst:';
connection node_2;
SET GLOBAL wsrep_sst_method = 'mysqldump';
connection node_1;
+connection node_2;
+connection node_1;
CREATE TABLE ten (f1 INTEGER);
INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY AUTO_INCREMENT, f2 CHAR(255)) ENGINE=InnoDB;
diff --git a/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test b/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
index 5a3f48e02a3..e660895cde6 100644
--- a/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
+++ b/mysql-test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
@@ -7,6 +7,11 @@
--source suite/galera/include/galera_sst_set_mysqldump.inc
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source suite/galera/include/auto_increment_offset_save.inc
+
--connection node_1
CREATE TABLE ten (f1 INTEGER);
INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
@@ -77,3 +82,6 @@ DROP TABLE ten;
# with SR, need to disable SR before that.
SET SESSION wsrep_trx_fragment_size=0;
--source suite/galera/include/galera_sst_restore.inc
+
+# Restore original auto_increment_offset values.
+--source suite/galera/include/auto_increment_offset_restore.inc