summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2012-10-11 07:01:44 +0400
committerSergey Petrunya <psergey@askmonty.org>2012-10-11 07:01:44 +0400
commit807fef40fffbbb8e92564a52b902b504ba8cfcdc (patch)
tree47a6326e95ed9bc924ab82a29b4163fe41bf9ea3 /mysql-test
parentf54cb33e4b79b9a54a60965dbe75ff03cfed4ea5 (diff)
downloadmariadb-git-807fef40fffbbb8e92564a52b902b504ba8cfcdc.tar.gz
Update test results after SHOW EXPLAIN merge-in.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/multi_source/simple.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/multi_source/simple.result b/mysql-test/suite/multi_source/simple.result
index 59f23179243..4018573d074 100644
--- a/mysql-test/suite/multi_source/simple.result
+++ b/mysql-test/suite/multi_source/simple.result
@@ -6,7 +6,7 @@ include/wait_for_slave_to_start.inc
set default_master_connection = 'slave2';
start all slaves;
Warnings:
-Note 1936 SLAVE 'slave2' started
+Note 1937 SLAVE 'slave2' started
include/wait_for_slave_to_start.inc
set default_master_connection = '';
show all slaves status;
@@ -67,7 +67,7 @@ Connection_name Slave_SQL_State Slave_IO_State Master_Host Master_User Master_Po
slave2 Slave has read all relay log; waiting for the slave I/O thread to update it Waiting for master to send event 127.0.0.1 root MYPORT_2 60 master-bin.000001 286 mysqld-relay-bin-slave2.000002 572 master-bin.000001 Yes Yes 0 0 286 875 None 0 No 0 No 0 0 2 0 1073741824 6 0 60.000
stop all slaves;
Warnings:
-Note 1937 SLAVE 'slave2' stopped
+Note 1938 SLAVE 'slave2' stopped
show all slaves status;
Connection_name Slave_SQL_State 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 Master_SSL_Verify_Server_Cert Last_IO_Errno Last_IO_Error Last_SQL_Errno Last_SQL_Error Replicate_Ignore_Server_Ids Master_Server_Id Retried_transactions Max_relay_log_size Executed_log_entries Slave_received_heartbeats Slave_heartbeat_period
slave2 127.0.0.1 root MYPORT_2 60 master-bin.000001 286 mysqld-relay-bin-slave2.000002 572 master-bin.000001 No No 0 0 286 875 None 0 No NULL No 0 0 2 0 1073741824 6 0 60.000