From 6dc00f97b7db13975a26fd92ffd08aaa60339b87 Mon Sep 17 00:00:00 2001 From: Elena Stepanova Date: Tue, 21 Feb 2017 15:03:34 +0200 Subject: [PATCH] MDEV-11774 tokudb.locks-select-update-3 failed in buildbot with lock wait timeout Increase tokudb_lock_timeout for the test --- storage/tokudb/mysql-test/tokudb/r/locks-select-update-3.result | 1 + storage/tokudb/mysql-test/tokudb/t/locks-select-update-3.test | 1 + 2 files changed, 2 insertions(+) diff --git a/storage/tokudb/mysql-test/tokudb/r/locks-select-update-3.result b/storage/tokudb/mysql-test/tokudb/r/locks-select-update-3.result index 8b31bf5a280..c1f05cdafd8 100644 --- a/storage/tokudb/mysql-test/tokudb/r/locks-select-update-3.result +++ b/storage/tokudb/mysql-test/tokudb/r/locks-select-update-3.result @@ -8,6 +8,7 @@ select * from t where a=1 for update; a b 1 0 update t set b=b+1 where a=1; +set session tokudb_lock_timeout= 60000; set session transaction isolation level read committed; begin; select * from t where a=1 for update; diff --git a/storage/tokudb/mysql-test/tokudb/t/locks-select-update-3.test b/storage/tokudb/mysql-test/tokudb/t/locks-select-update-3.test index a563f061add..5b54fa7313e 100644 --- a/storage/tokudb/mysql-test/tokudb/t/locks-select-update-3.test +++ b/storage/tokudb/mysql-test/tokudb/t/locks-select-update-3.test @@ -15,6 +15,7 @@ select * from t where a=1 for update; # t2 update update t set b=b+1 where a=1; connect(conn1,localhost,root); +set session tokudb_lock_timeout= 60000; set session transaction isolation level read committed; begin; # t2 select for update, should hang until t1 commits