diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-21 15:28:19 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-21 15:28:19 +0500 |
| commit | f77d416821d99fd8a195b51206f3c4dd56db3ca9 (patch) | |
| tree | d84a8516c7580369c2c7ff963992665ccf6efb60 /mysql-test | |
| parent | 8c353de9572b499c7905b0997740f9ac514c7e5a (diff) | |
| parent | 4cd1b2d313c3ba4cae325f6a6117f177f9fe2bc3 (diff) | |
| download | mariadb-git-f77d416821d99fd8a195b51206f3c4dd56db3ca9.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/28839/my50-28839
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_skip_error.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_skip_error.test | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_skip_error.result b/mysql-test/r/rpl_skip_error.result index 4cd4e1e73f5..5e67409a3d7 100644 --- a/mysql-test/r/rpl_skip_error.result +++ b/mysql-test/r/rpl_skip_error.result @@ -31,5 +31,5 @@ a 2 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 -Waiting for master to send event 127.0.0.1 root 9306 1 master-bin.000001 843 slave-relay-bin.000003 981 master-bin.000001 Yes Yes 0 0 843 981 None 0 No 0 +Waiting for master to send event 127.0.0.1 root MASTER_PORT 1 master-bin.000001 843 slave-relay-bin.000003 981 master-bin.000001 Yes Yes 0 0 843 981 None 0 No 0 drop table t1; diff --git a/mysql-test/t/rpl_skip_error.test b/mysql-test/t/rpl_skip_error.test index 1f476829bde..19eb2d8ae5e 100644 --- a/mysql-test/t/rpl_skip_error.test +++ b/mysql-test/t/rpl_skip_error.test @@ -31,6 +31,7 @@ sync_slave_with_master; connection slave; select @@server_id; select * from t1; +--replace_result $MASTER_MYPORT MASTER_PORT show slave status; connection master; drop table t1; |