[t:3453] cleaned up gen script, changed test to run with half second

timeout instead of one second.


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

mysql-test/suite/tokudb.locks/blocking-row-locks-testgen.py

@@ -54,6 +54,7 @@ write_point_queries = [
 write_range_queries = [
         ("select for update", mysqlgen_select_for_update_range),
         ("update", mysqlgen_update_range) ]
+timeouts = ["0", "500000"]
 
 # Here's where all the magic happens
 print "# Tokutek"
@@ -62,7 +63,7 @@ print "# Generated by %s on %s;" % (__file__, datetime.date.today())
 print ""
 mysqlgen_prepare()
 mysqlgen_reload_table()
-for timeout in ["0", "1000000"]:
+for timeout in timeouts:
     print "# testing with timeout %s" % timeout
     print "set global tokudb_lock_timeout=%s;" % timeout
     print ""

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

@@ -650,7 +650,7 @@ a	b
 4	100
 5	25
 6	36
-set global tokudb_lock_timeout=1000000;
+set global tokudb_lock_timeout=500000;
 begin;
 select * from t where a=1 for update;
 a	b

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

@@ -551,8 +551,8 @@ update t set b=b where a<=2;
 select * from t;
 connection default;
 
-# testing with timeout 1000000
-set global tokudb_lock_timeout=1000000;
+# testing with timeout 500000
+set global tokudb_lock_timeout=500000;
 
 # testing each point query vs each point query
 # testing conflict "select for update" vs. "select for update"