[t:3453] updated mysqltest scripts and results

git-svn-id: file:///svn/mysql/tests/mysql-test@34983 c7de825b-a66e-492c-adef-691d508d4ae1

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

@@ -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

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

@@ -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

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

@@ -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;

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

 # 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;