diff options
| author | holyfoot/hf@hfmain.(none) <> | 2007-06-22 10:12:15 +0500 |
|---|---|---|
| committer | holyfoot/hf@hfmain.(none) <> | 2007-06-22 10:12:15 +0500 |
| commit | 287f3485af64152f9fcfbafaa5b49f823d150ed5 (patch) | |
| tree | 5a60616b5a8d5b424e5d9f3183c51ddeb0b02cba | |
| parent | 802dcc7a457a69c7213cfb13da3377a9d4e5c20d (diff) | |
| parent | 78c53ea32ebf8b2a2b5ce1bf288b366d6eca0800 (diff) | |
| download | mariadb-git-287f3485af64152f9fcfbafaa5b49f823d150ed5.tar.gz | |
Merge bk@192.168.21.1:mysql-5.0-opt
into mysql.com:/home/hf/work/28839/my50-28839
| -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 5e67409a3d7..22ba357ef49 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 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 +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 843 # # master-bin.000001 Yes Yes 0 0 843 # None 0 No # drop table t1; diff --git a/mysql-test/t/rpl_skip_error.test b/mysql-test/t/rpl_skip_error.test index 19eb2d8ae5e..baa7a88b8bb 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_column 1 # 8 # 9 # 23 # 33 # --replace_result $MASTER_MYPORT MASTER_PORT show slave status; connection master; |