diff options
| author | unknown <monty@mysql.com> | 2003-11-23 21:03:10 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-11-23 21:03:10 +0200 |
| commit | c61d96d5baf8bb1d11502552a24cfca743e41419 (patch) | |
| tree | 2060d651b69d72e1e53f4a989ed73493e8390623 /mysql-test | |
| parent | a71285a7b3bf7de924b210122a0ecdcfed9cb779 (diff) | |
| download | mariadb-git-c61d96d5baf8bb1d11502552a24cfca743e41419.tar.gz | |
Fix test for binary builds
mysql-test/r/rpl_change_master.result:
Updated results
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_change_master.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/rpl_change_master.test | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/r/rpl_change_master.result index be2aec616b0..966f07af9d5 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; @@ -16,11 +16,11 @@ n 1 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 Relay_log_space -127.0.0.1 root 9306 1 master-bin.001 273 slave-relay-bin.002 255 master-bin.001 No No 0 0 214 314 +127.0.0.1 root MASTER_MYPORT 1 master-bin.001 273 slave-relay-bin.002 255 master-bin.001 No No 0 0 214 314 change master to master_user='root'; 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 Relay_log_space -127.0.0.1 root 9306 1 master-bin.001 214 slave-relay-bin.001 4 master-bin.001 No No 0 0 214 4 +127.0.0.1 root MASTER_MYPORT 1 master-bin.001 214 slave-relay-bin.001 4 master-bin.001 No No 0 0 214 4 select release_lock("a"); release_lock("a") 1 diff --git a/mysql-test/t/rpl_change_master.test b/mysql-test/t/rpl_change_master.test index 61de22fe57b..a13e045cf48 100644 --- a/mysql-test/t/rpl_change_master.test +++ b/mysql-test/t/rpl_change_master.test @@ -4,15 +4,17 @@ 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 show slave status; change master to master_user='root'; +--replace_result $MASTER_MYPORT MASTER_MYPORT show slave status; # Will restart from after the values(2), which is bug select release_lock("a"); |