Skip to content

Commit dc0613e

Browse files
author
Jan Lindström
committed
MDEV-15809: Test failure on galera.MW-44
Disable general log while truncating mysql.general_log to avoid queries to be inserted there.
1 parent 7793432 commit dc0613e

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

mysql-test/suite/galera/disabled.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ galera.MW-328A : have_deadlocks test not stable
3030
galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry_autocommit
3131
galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on
3232
query_cache : MDEV-15805 Test failure on galera.query_cache
33-
galera.MW-44 : MDEV-15809 Test failure on galera.MW-44
33+

mysql-test/suite/galera/r/MW-44.result

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
SET @@global.wsrep_replicate_myisam=OFF;
1+
SET GLOBAL general_log='OFF';
22
TRUNCATE TABLE mysql.general_log;
33
SELECT COUNT(*) from mysql.general_log;
44
COUNT(*)
5-
1
5+
0
6+
SELECT * FROM mysql.general_log;
7+
event_time user_host thread_id server_id command_type argument
8+
SET GLOBAL general_log='OFF';
69
TRUNCATE TABLE mysql.general_log;
710
SELECT COUNT(*) from mysql.general_log;
811
COUNT(*)
9-
1
12+
0
13+
SELECT * FROM mysql.general_log;
14+
event_time user_host thread_id server_id command_type argument
15+
SET GLOBAL general_log='ON';
1016
SELECT COUNT(*) from mysql.general_log;
1117
COUNT(*)
1218
1
@@ -18,8 +24,8 @@ SET SESSION wsrep_osu_method=TOI;
1824
SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%';
1925
COUNT(*) = 2
2026
1
27+
SET GLOBAL general_log='ON';
2128
SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%';
2229
COUNT(*) = 0
2330
1
2431
DROP TABLE t1;
25-
SET @@global.wsrep_replicate_myisam=Default;

mysql-test/suite/galera/t/MW-44.test

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@
55
--source include/galera_cluster.inc
66
--source include/have_innodb.inc
77

8-
SET @@global.wsrep_replicate_myisam=OFF;
98
--connection node_1
9+
SET GLOBAL general_log='OFF';
1010
TRUNCATE TABLE mysql.general_log;
1111
SELECT COUNT(*) from mysql.general_log;
12+
SELECT * FROM mysql.general_log;
1213

1314
--connection node_2
15+
SET GLOBAL general_log='OFF';
1416
TRUNCATE TABLE mysql.general_log;
1517
SELECT COUNT(*) from mysql.general_log;
18+
SELECT * FROM mysql.general_log;
1619

1720
--connection node_1
21+
SET GLOBAL general_log='ON';
1822
SELECT COUNT(*) from mysql.general_log;
1923
SET SESSION wsrep_osu_method=TOI;
2024
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
@@ -25,6 +29,7 @@ SET SESSION wsrep_osu_method=TOI;
2529
SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%';
2630

2731
--connection node_2
32+
SET GLOBAL general_log='ON';
2833
SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%';
2934
DROP TABLE t1;
30-
SET @@global.wsrep_replicate_myisam=Default;
35+

0 commit comments

Comments
 (0)