revision-id: 6ca6f25d4e96a479eb144a8da1066a27d0abce40 (mariadb-10.1.35-36-g6ca6f25d4e9) parent(s): 653038ccad1d91f3fff516f6b22462ab83e2b6f8 author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-06 14:16:09 +0300 message: MDEV-17143: Galera test failure on galera.MW-44 Test changes only. --- mysql-test/suite/galera/r/MW-44.result | 6 +----- mysql-test/suite/galera/t/MW-44.test | 8 -------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/mysql-test/suite/galera/r/MW-44.result b/mysql-test/suite/galera/r/MW-44.result index a1e55318422..394c749b253 100644 --- a/mysql-test/suite/galera/r/MW-44.result +++ b/mysql-test/suite/galera/r/MW-44.result @@ -1,10 +1,6 @@ -SET GLOBAL general_log='OFF'; TRUNCATE TABLE mysql.general_log; -SET GLOBAL general_log='OFF'; TRUNCATE TABLE mysql.general_log; SET GLOBAL general_log='ON'; -SELECT argument from mysql.general_log WHERE argument NOT LIKE 'SELECT%'; -argument SET SESSION wsrep_osu_method=TOI; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; SET SESSION wsrep_osu_method=RSU; @@ -16,5 +12,5 @@ COUNT(*) = 2 SET GLOBAL general_log='ON'; SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%'; COUNT(*) = 0 -1 +0 DROP TABLE t1; diff --git a/mysql-test/suite/galera/t/MW-44.test b/mysql-test/suite/galera/t/MW-44.test index 6b5eb823985..cb5db1b208a 100644 --- a/mysql-test/suite/galera/t/MW-44.test +++ b/mysql-test/suite/galera/t/MW-44.test @@ -6,21 +6,13 @@ --source include/have_innodb.inc --connection node_1 -SET GLOBAL general_log='OFF'; TRUNCATE TABLE mysql.general_log; ---let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log; ---source include/wait_condition.inc --connection node_2 -SET GLOBAL general_log='OFF'; TRUNCATE TABLE mysql.general_log; ---let $wait_condition = SELECT COUNT(*) = 0 FROM mysql.general_log; ---source include/wait_condition.inc --connection node_1 SET GLOBAL general_log='ON'; -SELECT argument from mysql.general_log WHERE argument NOT LIKE 'SELECT%'; - SET SESSION wsrep_osu_method=TOI; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; SET SESSION wsrep_osu_method=RSU;