diff options
| author | pem@mysql.com <> | 2004-02-10 18:44:02 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2004-02-10 18:44:02 +0100 |
| commit | c8585f3283816dea04c28774ef87537521b6aa80 (patch) | |
| tree | f04786f8a211a4c03eab547b7332792201289ac1 /mysql-test/r/rpl_until.result | |
| parent | 5344528b0034f0254d4c72b203c5888f1c8526c2 (diff) | |
| parent | 9de20058342fa7387071a3d70291a26db2e210c0 (diff) | |
| download | mariadb-git-c8585f3283816dea04c28774ef87537521b6aa80.tar.gz | |
Merge 4.1 into 5.0.
Diffstat (limited to 'mysql-test/r/rpl_until.result')
| -rw-r--r-- | mysql-test/r/rpl_until.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_until.result b/mysql-test/r/rpl_until.result index 17b505487e9..bd69a342bde 100644 --- a/mysql-test/r/rpl_until.result +++ b/mysql-test/r/rpl_until.result @@ -31,7 +31,7 @@ n 4 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 731 slave-relay-bin.000004 439 master-bin.000001 Yes No 0 0 304 866 Master master-bin.000001 304 No # +# 127.0.0.1 root MASTER_MYPORT 1 master-bin.000001 561 slave-relay-bin.000002 # master-bin.000001 Yes No 0 0 244 # Master master-bin.000001 244 No # start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; select * from t1; n |