summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorsasha@asksasha.com <>2005-07-29 21:00:28 -0600
committersasha@asksasha.com <>2005-07-29 21:00:28 -0600
commitfa7897c62a6cf831fddb0c7f2d4a36594e8d5c1d (patch)
treefcf9f3f551d6c642054660d8fd6fa15da6c64501 /mysql-test
parent0abc5c941d705a96c8d6706cf4c05f1635c43f06 (diff)
downloadmariadb-git-fa7897c62a6cf831fddb0c7f2d4a36594e8d5c1d.tar.gz
updates for BUG#10780 - fixed slave I/O thread running status to No while attempting
to connect
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_slave_status.result35
-rw-r--r--mysql-test/t/rpl_slave_status.test1
2 files changed, 34 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_slave_status.result b/mysql-test/r/rpl_slave_status.result
index 4eb2e87d221..5e9b6ab31ad 100644
--- a/mysql-test/r/rpl_slave_status.result
+++ b/mysql-test/r/rpl_slave_status.result
@@ -19,5 +19,36 @@ flush privileges;
stop slave;
start slave;
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
-Connecting to master 127.0.0.1 rpl MASTER_MYPORT 1 master-bin.000001 357 slave-relay-bin.000001 401 master-bin.000001 No Yes 0 0 357 401 None 0 No NULL
+Slave_IO_State Connecting to master
+Master_Host 127.0.0.1
+Master_User rpl
+Master_Port MASTER_MYPORT
+Connect_Retry 1
+Master_Log_File master-bin.000001
+Read_Master_Log_Pos 357
+Relay_Log_File slave-relay-bin.000001
+Relay_Log_Pos 401
+Relay_Master_Log_File master-bin.000001
+Slave_IO_Running No
+Slave_SQL_Running Yes
+Replicate_Do_DB
+Replicate_Ignore_DB
+Replicate_Do_Table
+Replicate_Ignore_Table
+Replicate_Wild_Do_Table
+Replicate_Wild_Ignore_Table
+Last_Errno 0
+Last_Error
+Skip_Counter 0
+Exec_Master_Log_Pos 357
+Relay_Log_Space 401
+Until_Condition None
+Until_Log_File
+Until_Log_Pos 0
+Master_SSL_Allowed No
+Master_SSL_CA_File
+Master_SSL_CA_Path
+Master_SSL_Cert
+Master_SSL_Cipher
+Master_SSL_Key
+Seconds_Behind_Master NULL
diff --git a/mysql-test/t/rpl_slave_status.test b/mysql-test/t/rpl_slave_status.test
index 6bccf6fd341..4e0d7dae35c 100644
--- a/mysql-test/t/rpl_slave_status.test
+++ b/mysql-test/t/rpl_slave_status.test
@@ -23,6 +23,7 @@ connection slave;
stop slave;
start slave;
--replace_result $MASTER_MYPORT MASTER_MYPORT
+--vertical_results
show slave status;
# end of 4.1 tests