diff options
Diffstat (limited to 'mysql-test/r/innodb_mysql_lock.result')
| -rw-r--r-- | mysql-test/r/innodb_mysql_lock.result | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/innodb_mysql_lock.result b/mysql-test/r/innodb_mysql_lock.result index 4c7e7f11987..70b86017008 100644 --- a/mysql-test/r/innodb_mysql_lock.result +++ b/mysql-test/r/innodb_mysql_lock.result @@ -1,3 +1,6 @@ +set @old_innodb_lock_wait_timeout=@@global.innodb_lock_wait_timeout; +set global innodb_lock_wait_timeout=300; +set session innodb_lock_wait_timeout=300; # # Bug #22876 Four-way deadlock # @@ -172,3 +175,4 @@ id value 1 12345 COMMIT; DROP TABLE t1; +set global innodb_lock_wait_timeout=@old_innodb_lock_wait_timeout; |