mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[t:3453] updated mysqltest scripts and results

Browse source 
git-svn-id: file:///svn/mysql/tests/mysql-test@34983 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
John Esmet 2011-09-23 14:50:54 +00:00
parent 885b129452
commit 7788e9576f
4 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/suite/tokudb.locks/r/blocking-row-locks-rw-conflict.result → mysql-test/suite/tokudb.locks/r/blocking-row-locks-conflict.result
View file

@ -72,3 +72,7 @@ a b
3 30
4 16
drop table t;
set global tokudb_lock_timeout=30000000;
select @@tokudb_lock_timeout;
@@tokudb_lock_timeout
30000000

4
mysql-test/suite/tokudb.locks/r/blocking-row-locks-getset.result
View file

@ -14,3 +14,7 @@ set global tokudb_lock_timeout=1000000;
select @@tokudb_lock_timeout;
@@tokudb_lock_timeout
1000000
set global tokudb_lock_timeout=30000000;
select @@tokudb_lock_timeout;
@@tokudb_lock_timeout
30000000

6
mysql-test/suite/tokudb.locks/t/blocking-row-locks-rw-conflict.test → mysql-test/suite/tokudb.locks/t/blocking-row-locks-conflict.test
View file

@ -89,6 +89,6 @@ select * from t;
connection conn1;
drop table t;
# TODO: How do I...
# 3.) Assert that some mysql code should return an error (ie: timeout)
# 4.) Have a connection in mysql-test sleep for n seconds
# Make sure we reset the default lock timeout, too
set global tokudb_lock_timeout=30000000;
select @@tokudb_lock_timeout;

5
mysql-test/suite/tokudb.locks/t/blocking-row-locks-getset.test
View file

@ -1,5 +1,6 @@
# 9/22/2011
# Test that blocking row locks work correctly.
# Test that getting and setting the value for
# blocking row lock timeout works correctly.
set storage_engine='tokudb';
@ -12,3 +13,5 @@ select @@tokudb_lock_timeout;
# settle on a 2 second timeout going forward
set global tokudb_lock_timeout=1000000;
select @@tokudb_lock_timeout;
set global tokudb_lock_timeout=30000000;
select @@tokudb_lock_timeout;