database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-11227 - mysqlimport -l doesn't issue UNLOCK TABLES

Browse Source 
Merged fix for innodb_mysql from 5.7.
This commit is contained in:
Sergey Vojtovich
2016-12-22 14:02:27 +04:00
parent 9b10b4181f
commit 0c3791caae
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/mix1.inc
View File

@@ -654,9 +654,11 @@ INSERT INTO t2 VALUES (1);
CONNECTION c2; CONNECTION c2;
SET AUTOCOMMIT=0; SET AUTOCOMMIT=0;
SET @old_lock_wait_timeout= @@lock_wait_timeout;
SET lock_wait_timeout= 1;
--error ER_LOCK_WAIT_TIMEOUT --error ER_LOCK_WAIT_TIMEOUT
LOCK TABLES t1 READ, t2 READ; LOCK TABLES t1 READ, t2 READ;
SET @@lock_wait_timeout= @old_lock_wait_timeout;
CONNECTION c1; CONNECTION c1;
COMMIT; COMMIT;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);

3
mysql-test/suite/innodb/r/innodb_mysql.result
View File

@@ -678,8 +678,11 @@ SET AUTOCOMMIT=0;
INSERT INTO t2 VALUES (1); INSERT INTO t2 VALUES (1);
connection c2; connection c2;
SET AUTOCOMMIT=0; SET AUTOCOMMIT=0;
SET @old_lock_wait_timeout= @@lock_wait_timeout;
SET lock_wait_timeout= 1;
LOCK TABLES t1 READ, t2 READ; LOCK TABLES t1 READ, t2 READ;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction ERROR HY000: Lock wait timeout exceeded; try restarting transaction
SET @@lock_wait_timeout= @old_lock_wait_timeout;
connection c1; connection c1;
COMMIT; COMMIT;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);