From 0c3791caae769e0e0a219ad092f81ef254960ecd Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Thu, 22 Dec 2016 14:02:27 +0400 Subject: MDEV-11227 - mysqlimport -l doesn't issue UNLOCK TABLES Merged fix for innodb_mysql from 5.7. --- mysql-test/suite/innodb/r/innodb_mysql.result | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mysql-test/suite/innodb/r/innodb_mysql.result') diff --git a/mysql-test/suite/innodb/r/innodb_mysql.result b/mysql-test/suite/innodb/r/innodb_mysql.result index a057719d18b..28f68eaa04b 100644 --- a/mysql-test/suite/innodb/r/innodb_mysql.result +++ b/mysql-test/suite/innodb/r/innodb_mysql.result @@ -678,8 +678,11 @@ SET AUTOCOMMIT=0; INSERT INTO t2 VALUES (1); connection c2; SET AUTOCOMMIT=0; +SET @old_lock_wait_timeout= @@lock_wait_timeout; +SET lock_wait_timeout= 1; LOCK TABLES t1 READ, t2 READ; ERROR HY000: Lock wait timeout exceeded; try restarting transaction +SET @@lock_wait_timeout= @old_lock_wait_timeout; connection c1; COMMIT; INSERT INTO t1 VALUES (1); -- cgit v1.2.1