Skip to content

Commit b22026d

Browse files
author
Jan Lindström
committed
Fix failure on galera_toi_drop_database test.
It is assumed that both insert..select statements take so long that drop database from node2 gets to abort them both but on fast machines it was too small. Increased the size of insert.
1 parent 0759c9b commit b22026d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

mysql-test/suite/galera/r/galera_toi_drop_database.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
55
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
66
CREATE TABLE t2 (f1 INTEGER) ENGINE=InnoDB;
77
SET SESSION wsrep_retry_autocommit = 0;
8-
INSERT INTO t1 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;;
8+
INSERT INTO t1 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5, ten AS a6;;
99
USE database1;
1010
SET SESSION wsrep_retry_autocommit = 0;
11-
INSERT INTO t2 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;;
11+
INSERT INTO t2 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5, ten AS a6;;
1212
DROP DATABASE database1;;
1313
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
1414
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction

mysql-test/suite/galera/t/galera_toi_drop_database.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ CREATE TABLE t2 (f1 INTEGER) ENGINE=InnoDB;
2222
# Make sure autocommit retrying does not kick in as this will mask the error we expect to get
2323
SET SESSION wsrep_retry_autocommit = 0;
2424
# Attemp to insert 1M rows
25-
--send INSERT INTO t1 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
25+
--send INSERT INTO t1 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5, ten AS a6;
2626

2727
--connection node_1a
2828
USE database1;
2929
SET SESSION wsrep_retry_autocommit = 0;
30-
--send INSERT INTO t2 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
30+
--send INSERT INTO t2 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5, ten AS a6;
3131

3232
--connection node_2
3333
--sleep 1

0 commit comments

Comments
 (0)