Commit c1f30805 authored by Jan Lindström's avatar Jan Lindström

MDEV-17143: Galera test failure on galera.MW-44

Start general log OFF and then truncate mysql.general_log and
use proper wait timeouts to make sure it is really empty.
parent f1bcfbb4
...@@ -2,12 +2,6 @@ TRUNCATE TABLE mysql.general_log; ...@@ -2,12 +2,6 @@ TRUNCATE TABLE mysql.general_log;
TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE mysql.general_log;
SELECT Argument FROM mysql.general_log; SELECT Argument FROM mysql.general_log;
Argument Argument
SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument LIKE 'TRUNCATE%'
SELECT Argument FROM mysql.general_log
SELECT Argument FROM mysql.general_log;
Argument
SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument LIKE 'TRUNCATE%'
SELECT Argument FROM mysql.general_log
SET GLOBAL general_log='ON'; SET GLOBAL general_log='ON';
SET SESSION wsrep_osu_method=TOI; SET SESSION wsrep_osu_method=TOI;
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
...@@ -18,8 +12,8 @@ SELECT argument FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument ...@@ -18,8 +12,8 @@ SELECT argument FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument
argument argument
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB
ALTER TABLE t1 ADD COLUMN f2 INTEGER ALTER TABLE t1 ADD COLUMN f2 INTEGER
SET GLOBAL general_log='ON'; SELECT Argument FROM mysql.general_log;
SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%'; Argument
COUNT(*) = 0
0
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL general_log='OFF';
SET GLOBAL general_log='OFF';
--log-output=TABLE --log-output=TABLE
--general-log=OFF
...@@ -9,13 +9,12 @@ ...@@ -9,13 +9,12 @@
TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE mysql.general_log;
--connection node_2 --connection node_2
TRUNCATE TABLE mysql.general_log; --let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log;
--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument LIKE 'TRUNCATE%';
--source include/wait_condition.inc --source include/wait_condition.inc
SELECT Argument FROM mysql.general_log; TRUNCATE TABLE mysql.general_log;
--connection node_1 --connection node_1
--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument LIKE 'TRUNCATE%'; --let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log;
--source include/wait_condition.inc --source include/wait_condition.inc
SELECT Argument FROM mysql.general_log; SELECT Argument FROM mysql.general_log;
...@@ -32,7 +31,10 @@ SET SESSION wsrep_osu_method=TOI; ...@@ -32,7 +31,10 @@ SET SESSION wsrep_osu_method=TOI;
SELECT argument FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%'; SELECT argument FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%';
--connection node_2 --connection node_2
SET GLOBAL general_log='ON'; SELECT Argument FROM mysql.general_log;
SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%';
DROP TABLE t1; DROP TABLE t1;
SET GLOBAL general_log='OFF';
--connection node_1
SET GLOBAL general_log='OFF';
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment