[Commits] b22026ddfd8: Fix failure on galera_toi_drop_database test.

jan jan.lindstrom at mariadb.com
Tue Mar 21 10:07:05 EET 2017


revision-id: b22026ddfd8c2b12e3793482c95c0977dd764b6b (mariadb-galera-10.0.29-38-gb22026ddfd8)
parent(s): 0759c9baf59b784b293b2141dac329aa6ff89f7f
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-03-21 10:00:02 +0200
message:

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.

---
 mysql-test/suite/galera/r/galera_toi_drop_database.result | 4 ++--
 mysql-test/suite/galera/t/galera_toi_drop_database.test   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mysql-test/suite/galera/r/galera_toi_drop_database.result b/mysql-test/suite/galera/r/galera_toi_drop_database.result
index 8f4098419eb..d652a5154be 100644
--- a/mysql-test/suite/galera/r/galera_toi_drop_database.result
+++ b/mysql-test/suite/galera/r/galera_toi_drop_database.result
@@ -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
diff --git a/mysql-test/suite/galera/t/galera_toi_drop_database.test b/mysql-test/suite/galera/t/galera_toi_drop_database.test
index 0a37a4010ce..e790a0ba812 100644
--- a/mysql-test/suite/galera/t/galera_toi_drop_database.test
+++ b/mysql-test/suite/galera/t/galera_toi_drop_database.test
@@ -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


More information about the commits mailing list