diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-02-10 02:24:10 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-02-10 02:24:10 +0200 |
| commit | 2282ec0f81360b477c2dec81e25a4bdafd0bce69 (patch) | |
| tree | 69a6614a7e21470c9758d001da0af86201529f37 /mysql-test | |
| parent | ecb11989ad22af2cdd2359dbb96705af240f1c84 (diff) | |
| parent | d5b3cb44b9a96d2154af4b0b7520f1e2cd3d3e58 (diff) | |
| download | mariadb-git-2282ec0f81360b477c2dec81e25a4bdafd0bce69.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_until.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_until.test | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_until.result b/mysql-test/r/rpl_until.result index cb60ccfb1c9..82b1ed233ec 100644 --- a/mysql-test/r/rpl_until.result +++ b/mysql-test/r/rpl_until.result @@ -55,7 +55,7 @@ stop slave; start slave until master_log_file='master-bin.000001', master_log_pos=561; show slave status; Slave_IO_State 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 Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master -# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 561 slave-relay-bin.000002 # master-bin.000001 Yes # 0 0 561 # Master master-bin.000001 561 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 561 slave-relay-bin.000002 # master-bin.000001 Yes No 0 0 561 # Master master-bin.000001 561 No # start slave until master_log_file='master-bin', master_log_pos=561; ERROR HY000: Wrong parameter or combination of parameters for START SLAVE UNTIL start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12; diff --git a/mysql-test/t/rpl_until.test b/mysql-test/t/rpl_until.test index 937a8c03f99..40d36110296 100644 --- a/mysql-test/t/rpl_until.test +++ b/mysql-test/t/rpl_until.test @@ -60,10 +60,10 @@ stop slave; # this should stop immideately start slave until master_log_file='master-bin.000001', master_log_pos=561; # 2 is not enough when running with valgrind ---real-sleep 4; +real_sleep 4 # here the sql slave thread should be stopped --replace_result $MASTER_MYPORT MASTER_MYPORT bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 ---replace_column 1 # 9 # 12 # 23 # 33 # +--replace_column 1 # 9 # 23 # 33 # show slave status; #testing various error conditions |