From cc3190e3674deb0f5b854c0c6c8a54471a6b582f Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Sun, 19 Jun 2016 20:30:03 +0300 Subject: [PATCH] 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 --- .../mysql-test/storage_engine/lock_concurrent.rdiff | 7 +++++-- .../mysql-test/storage_engine/lock_concurrent.rdiff | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/storage/innobase/mysql-test/storage_engine/lock_concurrent.rdiff b/storage/innobase/mysql-test/storage_engine/lock_concurrent.rdiff index fe4a0087fa9..c76a5fe7f15 100644 --- a/storage/innobase/mysql-test/storage_engine/lock_concurrent.rdiff +++ b/storage/innobase/mysql-test/storage_engine/lock_concurrent.rdiff @@ -1,7 +1,7 @@ --- 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; diff --git a/storage/xtradb/mysql-test/storage_engine/lock_concurrent.rdiff b/storage/xtradb/mysql-test/storage_engine/lock_concurrent.rdiff index fe4a0087fa9..6b7a52046e2 100644 --- a/storage/xtradb/mysql-test/storage_engine/lock_concurrent.rdiff +++ b/storage/xtradb/mysql-test/storage_engine/lock_concurrent.rdiff @@ -1,7 +1,7 @@ --- 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;