diff options
Diffstat (limited to 'mysql-test/suite/innodb/r/innodb-timeout.result')
| -rw-r--r-- | mysql-test/suite/innodb/r/innodb-timeout.result | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/innodb-timeout.result b/mysql-test/suite/innodb/r/innodb-timeout.result index bb71ba5cb3d..f252ebac314 100644 --- a/mysql-test/suite/innodb/r/innodb-timeout.result +++ b/mysql-test/suite/innodb/r/innodb-timeout.result @@ -1,4 +1,7 @@ set global innodb_lock_wait_timeout=42; +connect a,localhost,root,,; +connect b,localhost,root,,; +connection a; select @@innodb_lock_wait_timeout; @@innodb_lock_wait_timeout 42 @@ -6,6 +9,7 @@ set innodb_lock_wait_timeout=1; select @@innodb_lock_wait_timeout; @@innodb_lock_wait_timeout 1 +connection b; select @@innodb_lock_wait_timeout; @@innodb_lock_wait_timeout 42 @@ -17,24 +21,39 @@ set innodb_lock_wait_timeout=10; select @@innodb_lock_wait_timeout; @@innodb_lock_wait_timeout 10 +connect c,localhost,root,,; +connection c; select @@innodb_lock_wait_timeout; @@innodb_lock_wait_timeout 347 +disconnect c; +connection a; SET @connection_b_id = <connection_b_id>; create table t1(a int primary key)engine=innodb; begin; insert into t1 values(1),(2),(3); +connection b; select * from t1 for update; +connection a; commit; +connection b; a 1 2 3 +connection a; begin; insert into t1 values(4); +connection b; set innodb_lock_wait_timeout=3; select * from t1 for update; +connection a; commit; +connection b; ERROR HY000: Lock wait timeout exceeded; try restarting transaction +disconnect b; +connection a; +disconnect a; +connection default; drop table t1; set global innodb_lock_wait_timeout=<initial_timeout>; |