revision-id: c64ff168f2fdb3c3675908f9fe6565653cce867d (mariadb-10.1.35-37-gc64ff168f2f) parent(s): 6ca6f25d4e96a479eb144a8da1066a27d0abce40 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-07 08:04:01 +0300 message: Run #2. --- mysql-test/suite/galera/r/MW-44.result | 7 ++++--- mysql-test/suite/galera/t/MW-44.test | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/galera/r/MW-44.result b/mysql-test/suite/galera/r/MW-44.result index 394c749b253..7e3d2f4b7ec 100644 --- a/mysql-test/suite/galera/r/MW-44.result +++ b/mysql-test/suite/galera/r/MW-44.result @@ -6,9 +6,10 @@ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; SET SESSION wsrep_osu_method=RSU; ALTER TABLE t1 ADD COLUMN f2 INTEGER; SET SESSION wsrep_osu_method=TOI; -SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%'; -COUNT(*) = 2 -1 +SELECT argument FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%'; +argument +CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB +ALTER TABLE t1 ADD COLUMN f2 INTEGER SET GLOBAL general_log='ON'; SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%'; COUNT(*) = 0 diff --git a/mysql-test/suite/galera/t/MW-44.test b/mysql-test/suite/galera/t/MW-44.test index cb5db1b208a..6defa432879 100644 --- a/mysql-test/suite/galera/t/MW-44.test +++ b/mysql-test/suite/galera/t/MW-44.test @@ -19,7 +19,10 @@ SET SESSION wsrep_osu_method=RSU; ALTER TABLE t1 ADD COLUMN f2 INTEGER; SET SESSION wsrep_osu_method=TOI; -SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%'; +--let $wait_condition = SELECT COUNT(argument) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%'; +--source include/wait_condition.inc + +SELECT argument FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argument LIKE 'ALTER%'; --connection node_2 SET GLOBAL general_log='ON';