Commit cc3190e3 authored by Elena Stepanova's avatar Elena Stepanova

Follow-up for MDEV-6720 (enable connection log in mysqltest by default)

Some rdiff files in storage_engine test suite need to be updated accordingly
parent 5b008d4a
--- suite/storage_engine/lock_concurrent.result 2012-06-24 23:55:19.539380000 +0400
+++ suite/storage_engine/lock_concurrent.reject 2012-07-15 17:50:21.279222746 +0400
@@ -3,10 +3,19 @@
LOCK TABLES t1 WRITE CONCURRENT, t1 AS t2 READ;
@@ -4,6 +4,14 @@
connect con1,localhost,root,,;
SET lock_wait_timeout = 1;
LOCK TABLES t1 READ LOCAL;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
......@@ -13,8 +13,11 @@
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
UNLOCK TABLES;
connection default;
UNLOCK TABLES;
@@ -11,6 +19,7 @@
LOCK TABLES t1 READ LOCAL;
connection default;
LOCK TABLES t1 WRITE CONCURRENT, t1 AS t2 READ;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
UNLOCK TABLES;
......
--- suite/storage_engine/lock_concurrent.result 2012-06-24 23:55:19.539380000 +0400
+++ suite/storage_engine/lock_concurrent.reject 2012-07-15 17:50:21.279222746 +0400
@@ -3,10 +3,19 @@
LOCK TABLES t1 WRITE CONCURRENT, t1 AS t2 READ;
@@ -4,6 +4,14 @@
connect con1,localhost,root,,;
SET lock_wait_timeout = 1;
LOCK TABLES t1 READ LOCAL;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
......@@ -13,10 +13,13 @@
+# Also, this problem may cause a chain effect (more errors of different kinds in the test).
+# -------------------------------------------
UNLOCK TABLES;
connection default;
UNLOCK TABLES;
@@ -11,6 +19,7 @@
LOCK TABLES t1 READ LOCAL;
connection default;
LOCK TABLES t1 WRITE CONCURRENT, t1 AS t2 READ;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
UNLOCK TABLES;
connection con1;
UNLOCK TABLES;
DROP TABLE t1;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment