[Commits] 2fb224363d6: MDEV-13549: Galera test failures

jan jan.lindstrom at mariadb.com
Thu Apr 5 13:33:00 EEST 2018


revision-id: 2fb224363d65c59688262f5a1bc5012f369706b7 (mariadb-10.1.32-20-g2fb224363d6)
parent(s): 10579cebfde0e1f96327ad8ee8dadfbbebd8c291
author: Jan Lindström
committer: Jan Lindström
timestamp: 2018-04-05 13:30:41 +0300
message:

MDEV-13549: Galera test failures

Test did not reset modified variables correctly.

---
 mysql-test/suite/galera/disabled.def            |  1 -
 mysql-test/suite/galera/r/mysql-wsrep#33.result |  5 +++--
 mysql-test/suite/galera/t/mysql-wsrep#33.test   | 10 ++++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index b782d5464fe..03f8f41266c 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -25,7 +25,6 @@ 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
 galera_ssl_upgrade : MDEV-13549 Galera test failures
-mysql-wsrep#33 : MDEV-13549 Galera test failures
 galera_var_auto_inc_control_on : MDEV-13549 Galera test failures
 MW-44 : MDEV-13549 Galera test failures
 galera_var_retry_autocommit : MDEV-13549 Galera test failures
diff --git a/mysql-test/suite/galera/r/mysql-wsrep#33.result b/mysql-test/suite/galera/r/mysql-wsrep#33.result
index fc647a2000d..3e8cfdb42d3 100644
--- a/mysql-test/suite/galera/r/mysql-wsrep#33.result
+++ b/mysql-test/suite/galera/r/mysql-wsrep#33.result
@@ -1,4 +1,6 @@
 Setting SST method to mysqldump ...
+call mtr.add_suppression("WSREP: wsrep_sst_method is set to 'mysqldump' yet mysqld bind_address is set to '127.0.0.1'");
+call mtr.add_suppression("Failed to load slave replication state from table mysql.gtid_slave_pos");
 CREATE USER 'sst';
 GRANT ALL PRIVILEGES ON *.* TO 'sst';
 SET GLOBAL wsrep_sst_auth = 'sst:';
@@ -100,5 +102,4 @@ CALL mtr.add_suppression("Can't open and lock time zone table");
 CALL mtr.add_suppression("Can't open and lock privilege tables");
 CALL mtr.add_suppression("Info table is not ready to be used");
 CALL mtr.add_suppression("Native table .* has the wrong structure");
-SET GLOBAL general_log = ON;
-SET GLOBAL slow_query_log = ON;
+Restarting server ...
diff --git a/mysql-test/suite/galera/t/mysql-wsrep#33.test b/mysql-test/suite/galera/t/mysql-wsrep#33.test
index acc7c735849..351e457f165 100644
--- a/mysql-test/suite/galera/t/mysql-wsrep#33.test
+++ b/mysql-test/suite/galera/t/mysql-wsrep#33.test
@@ -3,6 +3,9 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
+--let $node_1=node_1
+--let $node_2=node_2
+--source suite/galera/include/auto_increment_offset_save.inc
 --source suite/galera/include/galera_sst_set_mysqldump.inc
 
 --source suite/galera/include/galera_st_disconnect_slave.inc
@@ -10,9 +13,8 @@
 --source suite/galera/include/galera_sst_restore.inc
 
 --connection node_2
-# We have to manually restore global_log and slow_query_log due to mysql-wsrep#108
-# Otherwise MTR's check_testcases complains
 
-SET GLOBAL general_log = ON;
-SET GLOBAL slow_query_log = ON;
+--echo Restarting server ...
+--source include/restart_mysqld.inc
 
+--source suite/galera/include/auto_increment_offset_restore.inc


More information about the commits mailing list