summaryrefslogtreecommitdiff
path: root/mysql-test/suite/versioning/t/update.test
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/versioning/t/update.test')
-rw-r--r--mysql-test/suite/versioning/t/update.test3
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/versioning/t/update.test b/mysql-test/suite/versioning/t/update.test
index 548505bd39a..71e946e6c2b 100644
--- a/mysql-test/suite/versioning/t/update.test
+++ b/mysql-test/suite/versioning/t/update.test
@@ -157,6 +157,8 @@ replace t1 values (1,2),(1,3),(2,4);
--echo #
--echo # MDEV-14829 Assertion `0' failed in Protocol::end_statement upon concurrent UPDATE
--echo #
+set @old_lock_wait_timeout= @@innodb_lock_wait_timeout;
+set @@innodb_lock_wait_timeout= 1073741824;
create or replace table t1 (pk int, a char(3), b char(3), primary key(pk))
engine=innodb with system versioning;
@@ -175,6 +177,7 @@ disconnect con1;
connection default;
reap;
drop table t1;
+set @@innodb_lock_wait_timeout= @old_lock_wait_timeout;
--echo #
--echo # MDEV-19406 Assertion on updating view of join with versioned table