revision-id: 257524293908f8de49b6160f05a78705da5846a9 (mariadb-10.1.32-21-g25752429390) parent(s): 2fb224363d65c59688262f5a1bc5012f369706b7 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-05 14:18:57 +0300 message: MDEV-13549: Galera test failures Fix test case MW-44 by disabling Galera replication of MyISAM tables (mysql.general_log especially) to avoid MDL lock wait later. --- mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/MW-44.result | 11 +++++++++++ mysql-test/suite/galera/t/MW-44.test | 5 +++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 03f8f41266c..407961fe1c4 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -26,7 +26,6 @@ galera_gcache_recover_manytrx : MDEV-13549 Galera test failures galera_ist_mysqldump : MDEV-13549 Galera test failures galera_ssl_upgrade : MDEV-13549 Galera test failures galera_var_auto_inc_control_on : MDEV-13549 Galera test failures -MW-44 : MDEV-13549 Galera test failures galera_var_retry_autocommit : MDEV-13549 Galera test failures pxc-421 : MDEV-13549 Galera test failures lp1376747-2 : MDEV-13549 Galera test failures diff --git a/mysql-test/suite/galera/r/MW-44.result b/mysql-test/suite/galera/r/MW-44.result index 28a6f1ac8dd..03de2205772 100644 --- a/mysql-test/suite/galera/r/MW-44.result +++ b/mysql-test/suite/galera/r/MW-44.result @@ -1,5 +1,15 @@ +SET @@global.wsrep_replicate_myisam=OFF; TRUNCATE TABLE mysql.general_log; +SELECT COUNT(*) from mysql.general_log; +COUNT(*) +1 TRUNCATE TABLE mysql.general_log; +SELECT COUNT(*) from mysql.general_log; +COUNT(*) +1 +SELECT COUNT(*) from mysql.general_log; +COUNT(*) +1 SET SESSION wsrep_osu_method=TOI; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; SET SESSION wsrep_osu_method=RSU; @@ -12,3 +22,4 @@ SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%'; COUNT(*) = 0 1 DROP TABLE t1; +SET @@global.wsrep_replicate_myisam=Default; diff --git a/mysql-test/suite/galera/t/MW-44.test b/mysql-test/suite/galera/t/MW-44.test index 55a3fd57f80..b0e58e2bafd 100644 --- a/mysql-test/suite/galera/t/MW-44.test +++ b/mysql-test/suite/galera/t/MW-44.test @@ -5,13 +5,17 @@ --source include/galera_cluster.inc --source include/have_innodb.inc +SET @@global.wsrep_replicate_myisam=OFF; --connection node_1 TRUNCATE TABLE mysql.general_log; +SELECT COUNT(*) from mysql.general_log; --connection node_2 TRUNCATE TABLE mysql.general_log; +SELECT COUNT(*) from mysql.general_log; --connection node_1 +SELECT COUNT(*) from mysql.general_log; SET SESSION wsrep_osu_method=TOI; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; SET SESSION wsrep_osu_method=RSU; @@ -23,3 +27,4 @@ SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argu --connection node_2 SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%'; DROP TABLE t1; +SET @@global.wsrep_replicate_myisam=Default;