revision-id: f01c4a10d74397220d7b7ffb724e6f52d3ab42a5 (mariadb-10.1.35-41-gf01c4a10d74) parent(s): 908ac40bdb9ab09cb718786f33bed417161a1748 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-08 08:12:55 +0300 message: Add one more wait for truncate in MW-44. --- mysql-test/suite/galera/r/MW-44.result | 8 ++++++++ mysql-test/suite/galera/t/MW-44.test | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/mysql-test/suite/galera/r/MW-44.result b/mysql-test/suite/galera/r/MW-44.result index 7e3d2f4b7ec..e5cc05057ce 100644 --- a/mysql-test/suite/galera/r/MW-44.result +++ b/mysql-test/suite/galera/r/MW-44.result @@ -1,5 +1,13 @@ TRUNCATE TABLE mysql.general_log; TRUNCATE TABLE 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 +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 SESSION wsrep_osu_method=TOI; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; diff --git a/mysql-test/suite/galera/t/MW-44.test b/mysql-test/suite/galera/t/MW-44.test index 6defa432879..5bc5fa9dab8 100644 --- a/mysql-test/suite/galera/t/MW-44.test +++ b/mysql-test/suite/galera/t/MW-44.test @@ -10,8 +10,15 @@ TRUNCATE TABLE mysql.general_log; --connection node_2 TRUNCATE TABLE mysql.general_log; +--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument LIKE 'TRUNCATE%'; +--source include/wait_condition.inc +SELECT Argument FROM mysql.general_log; --connection node_1 +--let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument LIKE 'TRUNCATE%'; +--source include/wait_condition.inc +SELECT Argument FROM mysql.general_log; + SET GLOBAL general_log='ON'; SET SESSION wsrep_osu_method=TOI; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;