diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-22 10:12:15 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-22 10:12:15 +0500 |
| commit | e434a5ca051fe298ef4092f8d3e2c3f076e3aba4 (patch) | |
| tree | 5a60616b5a8d5b424e5d9f3183c51ddeb0b02cba /mysql-test/r | |
| parent | 19446015866646659ddeaec722cd40dd900be7c3 (diff) | |
| parent | cb606a661a6df649fa6197e712373f54e8521d81 (diff) | |
| download | mariadb-git-e434a5ca051fe298ef4092f8d3e2c3f076e3aba4.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/r')
| -rw-r--r-- | mysql-test/r/rpl_skip_error.result | 2 |
1 files changed, 1 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; |