Skip to content

Commit 998b1c0

Browse files
committed
Fix galera test MW-44
1 parent 9419908 commit 998b1c0

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
11
SET GLOBAL general_log='OFF';
22
TRUNCATE TABLE mysql.general_log;
3-
SELECT COUNT(*) from mysql.general_log;
4-
COUNT(*)
5-
0
6-
SELECT * FROM mysql.general_log;
7-
event_time user_host thread_id server_id command_type argument
83
SET GLOBAL general_log='OFF';
94
TRUNCATE TABLE mysql.general_log;
10-
SELECT COUNT(*) from mysql.general_log;
11-
COUNT(*)
12-
0
13-
SELECT * FROM mysql.general_log;
14-
event_time user_host thread_id server_id command_type argument
155
SET GLOBAL general_log='ON';
16-
SELECT COUNT(*) from mysql.general_log;
17-
COUNT(*)
18-
1
6+
SELECT argument from mysql.general_log WHERE argument NOT LIKE 'SELECT%';
7+
argument
198
SET SESSION wsrep_osu_method=TOI;
209
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
2110
SET SESSION wsrep_osu_method=RSU;

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@
88
--connection node_1
99
SET GLOBAL general_log='OFF';
1010
TRUNCATE TABLE mysql.general_log;
11-
SELECT COUNT(*) from mysql.general_log;
12-
SELECT * FROM mysql.general_log;
11+
--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log;
12+
--source include/wait_condition.inc
1313

1414
--connection node_2
1515
SET GLOBAL general_log='OFF';
1616
TRUNCATE TABLE mysql.general_log;
17-
SELECT COUNT(*) from mysql.general_log;
18-
SELECT * FROM mysql.general_log;
17+
--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log;
18+
--source include/wait_condition.inc
1919

2020
--connection node_1
2121
SET GLOBAL general_log='ON';
22-
SELECT COUNT(*) from mysql.general_log;
22+
SELECT argument from mysql.general_log WHERE argument NOT LIKE 'SELECT%';
23+
2324
SET SESSION wsrep_osu_method=TOI;
2425
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
2526
SET SESSION wsrep_osu_method=RSU;

0 commit comments

Comments
 (0)