diff options
| author | unknown <paul@ice.snake.net> | 2003-11-20 21:16:45 -0600 |
|---|---|---|
| committer | unknown <paul@ice.snake.net> | 2003-11-20 21:16:45 -0600 |
| commit | 8848cea28797c2e08898bbcb782b6c830ee3f42e (patch) | |
| tree | f2eeb7a0a664a31f9501f6e5c189eb8c5fbe39ab /mysql-test/r/rpl_loaddata.result | |
| parent | ceb98b62bb5849445755ee75a690418087693f0e (diff) | |
| parent | 3ca0fa152506f7b28fe9a960409859abb1b4958c (diff) | |
| download | mariadb-git-8848cea28797c2e08898bbcb782b6c830ee3f42e.tar.gz | |
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Users/paul/mysql-4.1
mysql-test/r/rpl_loaddata.result:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/rpl_loaddata.result')
| -rw-r--r-- | mysql-test/r/rpl_loaddata.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result index 80e40924a55..65fc9d1b415 100644 --- a/mysql-test/r/rpl_loaddata.result +++ b/mysql-test/r/rpl_loaddata.result @@ -43,7 +43,7 @@ change master to master_user='test'; change master to master_user='root'; 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_PORT 1 master-bin.000001 1442 slave-relay-bin.000001 4 master-bin.000001 No No 0 0 1442 4 None 0 No # +# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1419 slave-relay-bin.000001 4 master-bin.000001 No No 0 0 1419 4 None 0 No # set global sql_slave_skip_counter=1; start slave; set sql_log_bin=0; |