[Commits] ba99110deea: Additional test fixes and additions to disabled.def

jan jan.lindstrom at mariadb.com
Fri Aug 18 08:16:53 EEST 2017


revision-id: ba99110deeaca84ca6143544b03c591fc8333df2 (mariadb-galera-10.0.31-52-gba99110deea)
parent(s): 5247ef25164f820d45d762fce275d965a6d81621
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-08-18 08:16:41 +0300
message:

Additional test fixes and additions to disabled.def

---
 mysql-test/suite/galera/disabled.def                        |  7 +++++++
 .../suite/galera/r/galera_restart_on_unknown_option.result  |  2 --
 mysql-test/suite/galera/t/galera#414.test                   |  9 +++++++--
 mysql-test/suite/galera/t/galera_ist_mysqldump.cnf          |  1 +
 mysql-test/suite/galera/t/galera_ist_rsync.cnf              |  2 ++
 mysql-test/suite/galera/t/galera_ist_rsync.test             |  5 +++++
 .../suite/galera/t/galera_restart_on_unknown_option.test    | 13 +++++++------
 .../suite/galera/t/galera_wsrep_provider_unset_set.test     |  7 +++++++
 8 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 94e2f19da8a..1f605727b27 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -31,3 +31,10 @@ galera_gcache_recover : MDEV-13549 Galera test failures
 galera_gcache_recover_full_gcache : MDEV-13549 Galera test failures
 galera_gcache_recover_manytrx : MDEV-13549 Galera test failures
 galera_ist_mysqldump : MDEV-13549 Galera test failures
+mysql-wsrep#31 :  MDEV-13549 Galera test failures
+galera_migrate : MariaDB 10.0 does not support START SLAVE USER
+galera_concurrent_ctas : MDEV-13549 Galera test failures
+galera_bf_abort_for_update : MDEV-13549 Galera test failures
+galera_wsrep_desync_wsrep_on : MDEV-13549 Galera test failures
+galera_ssl_upgrade : MDEV-13549 Galera test failures
+mysql-wsrep#33 : MDEV-13549 Galera test failures
diff --git a/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result b/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
index 998ad345a67..a21b1edf3e7 100644
--- a/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
+++ b/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
@@ -38,5 +38,3 @@ f1	f2
 2	d
 3	d
 DROP TABLE t1;
-set GLOBAL auto_increment_offset = 1;
-set GLOBAL auto_increment_offset = 2;
diff --git a/mysql-test/suite/galera/t/galera#414.test b/mysql-test/suite/galera/t/galera#414.test
index 8fda68f0b76..de10898df42 100644
--- a/mysql-test/suite/galera/t/galera#414.test
+++ b/mysql-test/suite/galera/t/galera#414.test
@@ -6,6 +6,11 @@
 --source include/have_innodb.inc
 --source include/galera_cluster.inc
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
 # We perform the shutdown/restart sequence in here. If there was a crash during shutdown, MTR will detect it
 
 --connection node_2
@@ -29,10 +34,10 @@ SET SESSION wsrep_on = ON;
 
 --connection node_1
 CALL mtr.add_suppression("Failed to set packet size");
-set GLOBAL auto_increment_offset = 1;
 
 --connection node_2
 --let $wait_condition = SELECT VARIABLE_VALUE = 'ON' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_ready';
 --source include/wait_condition.inc
 CALL mtr.add_suppression("Failed to set packet size");
-set GLOBAL auto_increment_offset = 2;
+
+--source include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera/t/galera_ist_mysqldump.cnf b/mysql-test/suite/galera/t/galera_ist_mysqldump.cnf
index db6b7d5e129..357c8678658 100644
--- a/mysql-test/suite/galera/t/galera_ist_mysqldump.cnf
+++ b/mysql-test/suite/galera/t/galera_ist_mysqldump.cnf
@@ -9,3 +9,4 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true'
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;pc.ignore_sb=true'
 
+
diff --git a/mysql-test/suite/galera/t/galera_ist_rsync.cnf b/mysql-test/suite/galera/t/galera_ist_rsync.cnf
index bbe0f6047fb..797e3651967 100644
--- a/mysql-test/suite/galera/t/galera_ist_rsync.cnf
+++ b/mysql-test/suite/galera/t/galera_ist_rsync.cnf
@@ -5,7 +5,9 @@ wsrep_sst_method=rsync
 
 [mysqld.1]
 wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.ignore_sb=true'
+wsrep_sync_wait=1
 
 [mysqld.2]
 wsrep_provider_options='base_port=@mysqld.2.#galera_port;pc.ignore_sb=true'
+wsrep_sync_wait=1
 
diff --git a/mysql-test/suite/galera/t/galera_ist_rsync.test b/mysql-test/suite/galera/t/galera_ist_rsync.test
index 41d1a0c1fc2..1da79cd4214 100644
--- a/mysql-test/suite/galera/t/galera_ist_rsync.test
+++ b/mysql-test/suite/galera/t/galera_ist_rsync.test
@@ -2,7 +2,12 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
 --source suite/galera/include/galera_st_disconnect_slave.inc
 --source suite/galera/include/galera_st_shutdown_slave.inc
 --source suite/galera/include/galera_st_kill_slave.inc
 --source suite/galera/include/galera_st_kill_slave_ddl.inc
+--source include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test b/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
index 51b2ad429a0..a8ea639415d 100644
--- a/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
+++ b/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
@@ -6,6 +6,11 @@
 CALL mtr.add_suppression("Aborting");
 CALL mtr.add_suppression("unknown option '--galera-unknown-option'");
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
 #
 # We should count the number of "Assertion failed" warnings
 # in the log file before and after testing. To do this we need
@@ -126,12 +131,6 @@ SELECT * FROM t1;
 
 DROP TABLE t1;
 
-set GLOBAL auto_increment_offset = 1;
-
---connection node_2
-
-set GLOBAL auto_increment_offset = 2;
-
 #
 # We should count the number of "Assertion failed" warnings
 # in the log file during test phase - to print the error message
@@ -154,3 +153,5 @@ set GLOBAL auto_increment_offset = 2;
    }
 EOF
 --remove_file $TEST_LOG.copy
+
+--source include/auto_increment_offset_restore.inc
diff --git a/mysql-test/suite/galera/t/galera_wsrep_provider_unset_set.test b/mysql-test/suite/galera/t/galera_wsrep_provider_unset_set.test
index b82d111723c..7f91495fcc4 100644
--- a/mysql-test/suite/galera/t/galera_wsrep_provider_unset_set.test
+++ b/mysql-test/suite/galera/t/galera_wsrep_provider_unset_set.test
@@ -6,6 +6,11 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+# Save original auto_increment_offset values.
+--let $node_1=node_1
+--let $node_2=node_2
+--source include/auto_increment_offset_save.inc
+
 --connection node_1
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (1);
@@ -41,3 +46,5 @@ SELECT COUNT(*) = 4 FROM t1;
 SELECT COUNT(*) = 3 FROM t1;
 
 DROP TABLE t1;
+
+--source include/auto_increment_offset_restore.inc


More information about the commits mailing list