diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-01-24 22:49:47 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-01-24 22:49:47 -0700 |
| commit | de172721edc0d619f12ea9769373fa0d7fcfbeb5 (patch) | |
| tree | dbd006cf3d35d4daf9ae21af895de3a3261faf0b /mysql-test | |
| parent | 1c2802931e0ac2c328d5a0caa8955e774048bbb3 (diff) | |
| download | mariadb-git-de172721edc0d619f12ea9769373fa0d7fcfbeb5.tar.gz | |
more predicatable slave behaviour with wait_for_slave_stop in mysqltest
fixed a couple of bugs with SEQ_READ_APPEND cache
rpl000016 still has non-deterministic result, but I am going to commit and
push since what I have is now better than what is in the main repository
client/mysqltest.c:
added wait_for_slave_to_stop
cleaned up TODO and comments
include/my_sys.h:
fixed race in flush_io_cache in SEQ_READ_APPEND cache
mysql-test/r/rpl000016.result:
updated result
mysql-test/t/rpl000016.test:
use wait_for_slave_to_stop to have deterministic slave behaviour for the test
mysys/mf_iocache.c:
fixed race in flush_io_cache()
fixed failure to unlock mutex in my_b_append()
sql/log.cc:
be compatible with 3.23 master
sql/log_event.cc:
3.23 master compat
sql/slave.cc:
3.23 master compat
sql/sql_class.h:
compat with 3.23 master
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl000016.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/rpl000016.test | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result index dae60021157..aab3635ea52 100644 --- a/mysql-test/r/rpl000016.result +++ b/mysql-test/r/rpl000016.result @@ -33,7 +33,6 @@ master-bin.003 insert into t2 values(1234); set insert_id=1234; insert into t2 values(NULL); -slave stop; set sql_slave_skip_counter=1; slave start; purge master logs to 'master-bin.003'; @@ -66,7 +65,7 @@ slave stop; slave start; show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos -127.0.0.1 root MASTER_PORT 60 master-bin.006 445 mysql-relay-bin.004 1312 master-bin.006 Yes Yes 0 0 445 +127.0.0.1 root MASTER_PORT 60 master-bin.006 445 mysql-relay-bin.004 1376 master-bin.006 Yes Yes 0 0 445 lock tables t3 read; select count(*) from t3 where n >= 4; count(*) diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test index 4e094650b2a..7559b2d3515 100644 --- a/mysql-test/t/rpl000016.test +++ b/mysql-test/t/rpl000016.test @@ -51,9 +51,7 @@ insert into t2 values(NULL); connection slave; sync_with_master; -#the slave may have already stopped, so we ignore the error ---error 0,1199 -!slave stop; +wait_for_slave_to_stop; #restart slave skipping one event set sql_slave_skip_counter=1; |