diff options
| -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 f15cd6c928a..65960875653 100644 --- a/mysql-test/r/rpl_skip_error.result +++ b/mysql-test/r/rpl_skip_error.result @@ -32,5 +32,5 @@ a 3 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 Master_SSL_Verify_Server_Cert -Waiting for master to send event 127.0.0.1 root MASTER_PORT 1 master-bin.000001 776 slave-relay-bin.000003 922 master-bin.000001 Yes Yes 0 0 776 1077 None 0 No 0 No +Waiting for master to send event 127.0.0.1 root MASTER_PORT 1 master-bin.000001 776 # # master-bin.000001 Yes Yes 0 0 776 # None 0 No 0 No drop table t1; diff --git a/mysql-test/t/rpl_skip_error.test b/mysql-test/t/rpl_skip_error.test index 1749a3a896d..b68b637b3b0 100644 --- a/mysql-test/t/rpl_skip_error.test +++ b/mysql-test/t/rpl_skip_error.test @@ -42,6 +42,7 @@ sync_slave_with_master; connection slave; select @@server_id; select * from t1; +--replace_column 1 # 8 # 9 # 23 # 33 # --replace_result $MASTER_MYPORT MASTER_PORT show slave status; connection master; |