Merge branch 'master' of github.com:Tokutek/ft-engine

mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_released.test

@@ -27,7 +27,8 @@ send insert into t values (1);
 
 # should find the presence of a lock on 1st transaction
 connection default;
-real_sleep 1; # give some time for conn_b to block
+let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update';
+source include/wait_condition.inc;
 replace_column 1 TRX_ID 2 MYSQL_ID; 
 select * from information_schema.tokudb_locks;
 

mysql-test/suite/tokudb/t/i_s_tokudb_lock_waits_timeout.test

@@ -24,7 +24,8 @@ send insert into t values (1);
 
 # should find the presence of a lock on 1st transaction
 connection default;
-real_sleep 1; # give some time for conn_b to get blocked
+let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update';
+source include/wait_condition.inc;
 replace_column 1 TRX_ID 2 MYSQL_ID; 
 select * from information_schema.tokudb_locks;
 

mysql-test/suite/tokudb/t/i_s_tokudb_locks_released.test

@@ -30,7 +30,8 @@ send insert into t values (1);
 
 # should find the presence of a lock on 2nd transaction
 connection default;
-real_sleep 1; # give some time for conn_b to get blocked
+let $wait_condition= select count(*)=1 from information_schema.processlist where info='insert into t values (1)' and state='update';
+source include/wait_condition.inc;
 replace_column 1 TRX_ID 2 MYSQL_ID;
 eval select * from information_schema.tokudb_locks;