MDEV-15809: Test failure on galera.MW-44

Disable general log while truncating mysql.general_log to avoid queries to be inserted there.
MariaDB · Apr 26, 2018 · dc0613e · dc0613e
1 parent 7793432
commit dc0613e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
@@ -30,4 +30,4 @@ galera.MW-328A : have_deadlocks test not stable
 galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry_autocommit
 galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on
 query_cache : MDEV-15805 Test failure on galera.query_cache
-galera.MW-44 : MDEV-15809 Test failure on galera.MW-44
+
diff --git a/mysql-test/suite/galera/r/MW-44.result b/mysql-test/suite/galera/r/MW-44.result
@@ -1,12 +1,18 @@
-SET @@global.wsrep_replicate_myisam=OFF;
+SET GLOBAL general_log='OFF';
 TRUNCATE TABLE mysql.general_log;
 SELECT COUNT(*) from mysql.general_log;
 COUNT(*)
-1
+0
+SELECT * FROM mysql.general_log;
+event_time	user_host	thread_id	server_id	command_type	argument
+SET GLOBAL general_log='OFF';
 TRUNCATE TABLE mysql.general_log;
 SELECT COUNT(*) from mysql.general_log;
 COUNT(*)
-1
+0
+SELECT * FROM mysql.general_log;
+event_time	user_host	thread_id	server_id	command_type	argument
+SET GLOBAL general_log='ON';
 SELECT COUNT(*) from mysql.general_log;
 COUNT(*)
 1
@@ -18,8 +24,8 @@ SET SESSION wsrep_osu_method=TOI;
 SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%';
 COUNT(*) = 2
 1
+SET GLOBAL general_log='ON';
 SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%';
 COUNT(*) = 0
 1
 DROP TABLE t1;
-SET @@global.wsrep_replicate_myisam=Default;
diff --git a/mysql-test/suite/galera/t/MW-44.test b/mysql-test/suite/galera/t/MW-44.test
@@ -5,16 +5,20 @@
 --source include/galera_cluster.inc
 --source include/have_innodb.inc
 
-SET @@global.wsrep_replicate_myisam=OFF;
 --connection node_1
+SET GLOBAL general_log='OFF';
 TRUNCATE TABLE mysql.general_log;
 SELECT COUNT(*) from mysql.general_log;
+SELECT * FROM mysql.general_log;
 
 --connection node_2
+SET GLOBAL general_log='OFF';
 TRUNCATE TABLE mysql.general_log;
 SELECT COUNT(*) from mysql.general_log;
+SELECT * FROM mysql.general_log;
 
 --connection node_1
+SET GLOBAL general_log='ON';
 SELECT COUNT(*) from mysql.general_log;
 SET SESSION wsrep_osu_method=TOI;
 CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
@@ -25,6 +29,7 @@ SET SESSION wsrep_osu_method=TOI;
 SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%';
 
 --connection node_2
+SET GLOBAL general_log='ON';
 SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%';
 DROP TABLE t1;
-SET @@global.wsrep_replicate_myisam=Default;
+