Skip to content

Commit

Permalink
Fix failure on galera_toi_drop_database test.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Jan Lindström committed Mar 21, 2017
1 parent 0759c9b commit b22026d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions mysql-test/suite/galera/r/galera_toi_drop_database.result
Expand Up @@ -5,10 +5,10 @@ INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB;
CREATE TABLE t2 (f1 INTEGER) ENGINE=InnoDB;
SET SESSION wsrep_retry_autocommit = 0;
INSERT INTO t1 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;;
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;;
USE database1;
SET SESSION wsrep_retry_autocommit = 0;
INSERT INTO t2 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;;
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;;
DROP DATABASE database1;;
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/galera/t/galera_toi_drop_database.test
Expand Up @@ -22,12 +22,12 @@ CREATE TABLE t2 (f1 INTEGER) ENGINE=InnoDB;
# Make sure autocommit retrying does not kick in as this will mask the error we expect to get
SET SESSION wsrep_retry_autocommit = 0;
# Attemp to insert 1M rows
--send INSERT INTO t1 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
--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;

--connection node_1a
USE database1;
SET SESSION wsrep_retry_autocommit = 0;
--send INSERT INTO t2 (f1) SELECT 1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
--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;

--connection node_2
--sleep 1
Expand Down

0 comments on commit b22026d

Please sign in to comment.