Commit b7de8a0b authored by monty@mysql.com's avatar monty@mysql.com

Change to use real_sleep to make test work in build environment

parent 19845c6b
...@@ -33,15 +33,11 @@ ...@@ -33,15 +33,11 @@
Used when function is one of: Used when function is one of:
HA_EXTRA_WRITE_CACHE HA_EXTRA_WRITE_CACHE
HA_EXTRA_CACHE HA_EXTRA_CACHE
HA_EXTRA_BULK_INSERT_BEGIN
If extra_arg is 0, then the default cache size is used.
HA_EXTRA_BULK_INSERT_FLUSH
extra_arg is a a pointer to which index to flush (uint*)
RETURN VALUES RETURN VALUES
0 ok 0 ok
# error
*/ */
int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg)
{ {
int error=0; int error=0;
......
...@@ -8,7 +8,7 @@ select get_lock("a",5); ...@@ -8,7 +8,7 @@ select get_lock("a",5);
get_lock("a",5) get_lock("a",5)
1 1
create table t1(n int); create table t1(n int);
insert into t1 values(1+get_lock("a",10)*0); insert into t1 values(1+get_lock("a",15)*0);
insert into t1 values(2); insert into t1 values(2);
stop slave; stop slave;
select * from t1; select * from t1;
......
...@@ -4,11 +4,11 @@ connection slave; ...@@ -4,11 +4,11 @@ connection slave;
select get_lock("a",5); select get_lock("a",5);
connection master; connection master;
create table t1(n int); create table t1(n int);
insert into t1 values(1+get_lock("a",10)*0); insert into t1 values(1+get_lock("a",15)*0);
insert into t1 values(2); insert into t1 values(2);
save_master_pos; save_master_pos;
connection slave; connection slave;
sleep 3; # can't sync_with_master as we should be blocked --real_sleep 3; # can't sync_with_master as we should be blocked
stop slave; stop slave;
select * from t1; select * from t1;
--replace_result $MASTER_MYPORT MASTER_MYPORT --replace_result $MASTER_MYPORT MASTER_MYPORT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment