Skip to content

Commit 6449f05

Browse files
author
Jan Lindström
committed
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.
1 parent 33b103b commit 6449f05

File tree

3 files changed

+16
-1
lines changed

3 files changed

+16
-1
lines changed

mysql-test/suite/galera/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ galera_gcache_recover_manytrx : MDEV-13549 Galera test failures
2626
galera_ist_mysqldump : MDEV-13549 Galera test failures
2727
galera_ssl_upgrade : MDEV-13549 Galera test failures
2828
galera_var_auto_inc_control_on : MDEV-13549 Galera test failures
29-
MW-44 : MDEV-13549 Galera test failures
3029
galera_var_retry_autocommit : MDEV-13549 Galera test failures
3130
pxc-421 : MDEV-13549 Galera test failures
3231
lp1376747-2 : MDEV-13549 Galera test failures

mysql-test/suite/galera/r/MW-44.result

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
SET @@global.wsrep_replicate_myisam=OFF;
12
TRUNCATE TABLE mysql.general_log;
3+
SELECT COUNT(*) from mysql.general_log;
4+
COUNT(*)
5+
1
26
TRUNCATE TABLE mysql.general_log;
7+
SELECT COUNT(*) from mysql.general_log;
8+
COUNT(*)
9+
1
10+
SELECT COUNT(*) from mysql.general_log;
11+
COUNT(*)
12+
1
313
SET SESSION wsrep_osu_method=TOI;
414
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
515
SET SESSION wsrep_osu_method=RSU;
@@ -12,3 +22,4 @@ SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%';
1222
COUNT(*) = 0
1323
1
1424
DROP TABLE t1;
25+
SET @@global.wsrep_replicate_myisam=Default;

mysql-test/suite/galera/t/MW-44.test

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@
55
--source include/galera_cluster.inc
66
--source include/have_innodb.inc
77

8+
SET @@global.wsrep_replicate_myisam=OFF;
89
--connection node_1
910
TRUNCATE TABLE mysql.general_log;
11+
SELECT COUNT(*) from mysql.general_log;
1012

1113
--connection node_2
1214
TRUNCATE TABLE mysql.general_log;
15+
SELECT COUNT(*) from mysql.general_log;
1316

1417
--connection node_1
18+
SELECT COUNT(*) from mysql.general_log;
1519
SET SESSION wsrep_osu_method=TOI;
1620
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
1721
SET SESSION wsrep_osu_method=RSU;
@@ -23,3 +27,4 @@ SELECT COUNT(*) = 2 FROM mysql.general_log WHERE argument LIKE 'CREATE%' OR argu
2327
--connection node_2
2428
SELECT COUNT(*) = 0 FROM mysql.general_log WHERE argument NOT LIKE 'SELECT%';
2529
DROP TABLE t1;
30+
SET @@global.wsrep_replicate_myisam=Default;

0 commit comments

Comments
 (0)