diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-22 15:53:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-22 15:53:05 +0200 |
| commit | e1e920bf63550304eccee057edc568479ecf79ac (patch) | |
| tree | 661a3d2591f4cd1c56f6be37095034ca9db9c8be /storage/tokudb | |
| parent | 3c47ed48490f0bab1996beab5b22f386451f0d88 (diff) | |
| parent | a0ce92ddc7d3f147c5103b9470d10bad194b41e4 (diff) | |
| download | mariadb-git-e1e920bf63550304eccee057edc568479ecf79ac.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage/tokudb')
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/r/locks-select-update-3.result | 1 | ||||
| -rw-r--r-- | storage/tokudb/mysql-test/tokudb/t/locks-select-update-3.test | 1 |
2 files changed, 2 insertions, 0 deletions
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 |