From 78d3586b4dccda82c5c0f9d0850cd97722bb1e85 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 25 Nov 2003 23:14:49 +0200 Subject: Change to use real_sleep to make test work in build environment myisam/mi_extra.c: Fix comment mysql-test/r/rpl_change_master.result: new results --- myisam/mi_extra.c | 10 +++------- mysql-test/r/rpl_change_master.result | 2 +- mysql-test/t/rpl_change_master.test | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/myisam/mi_extra.c b/myisam/mi_extra.c index fcc753b62e5..10f52f1e39a 100644 --- a/myisam/mi_extra.c +++ b/myisam/mi_extra.c @@ -33,15 +33,11 @@ Used when function is one of: HA_EXTRA_WRITE_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 - 0 ok + RETURN VALUES + 0 ok + # error */ - int mi_extra(MI_INFO *info, enum ha_extra_function function, void *extra_arg) { int error=0; diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/r/rpl_change_master.result index 546a0ee2710..a6342d47b49 100644 --- a/mysql-test/r/rpl_change_master.result +++ b/mysql-test/r/rpl_change_master.result @@ -8,7 +8,7 @@ select get_lock("a",5); get_lock("a",5) 1 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); stop slave; select * from t1; diff --git a/mysql-test/t/rpl_change_master.test b/mysql-test/t/rpl_change_master.test index 94f044d5413..e6452b5b619 100644 --- a/mysql-test/t/rpl_change_master.test +++ b/mysql-test/t/rpl_change_master.test @@ -4,11 +4,11 @@ connection slave; select get_lock("a",5); connection master; 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); save_master_pos; 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; select * from t1; --replace_result $MASTER_MYPORT MASTER_MYPORT -- cgit v1.2.1