diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-12-22 14:02:27 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-12-22 14:02:27 +0400 |
| commit | 0c3791caae769e0e0a219ad092f81ef254960ecd (patch) | |
| tree | 3f6dd541296212332dd1c019e763f022d3e9afd2 /mysql-test | |
| parent | 9b10b4181f70634c9fab96ff0a225147b64396d7 (diff) | |
| download | mariadb-git-mariadb-10.2.3.tar.gz | |
MDEV-11227 - mysqlimport -l doesn't issue UNLOCK TABLESmariadb-10.2.3
Merged fix for innodb_mysql from 5.7.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/mix1.inc | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb_mysql.result | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc index 7eae4235baa..5e6797e69ff 100644 --- a/mysql-test/include/mix1.inc +++ b/mysql-test/include/mix1.inc @@ -654,9 +654,11 @@ INSERT INTO t2 VALUES (1); CONNECTION c2; SET AUTOCOMMIT=0; +SET @old_lock_wait_timeout= @@lock_wait_timeout; +SET lock_wait_timeout= 1; --error ER_LOCK_WAIT_TIMEOUT LOCK TABLES t1 READ, t2 READ; - +SET @@lock_wait_timeout= @old_lock_wait_timeout; CONNECTION c1; COMMIT; INSERT INTO t1 VALUES (1); 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); |