summaryrefslogtreecommitdiff
path: root/mysql-test/r/rpl_server_id2.result
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-05-05 22:01:41 +0200
committerunknown <guilhem@mysql.com>2004-05-05 22:01:41 +0200
commit974ce66bddf0a1382abb49dfe52a61342e8a80a2 (patch)
tree00007fd67d5e86b5600c00f1a2997beceb5a05d8 /mysql-test/r/rpl_server_id2.result
parent19d3f588f2165ed5025fe0b88c856474b913d6b8 (diff)
downloadmariadb-git-974ce66bddf0a1382abb49dfe52a61342e8a80a2.tar.gz
Replication:
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread). mysql-test/r/rpl_server_id2.result: result update sql/slave.cc: As the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
Diffstat (limited to 'mysql-test/r/rpl_server_id2.result')
-rw-r--r--mysql-test/r/rpl_server_id2.result10
1 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/r/rpl_server_id2.result
index 5f4ec9df4c4..d8d805fc0d2 100644
--- a/mysql-test/r/rpl_server_id2.result
+++ b/mysql-test/r/rpl_server_id2.result
@@ -1,17 +1,19 @@
-slave stop;
+stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-slave start;
+start slave;
drop table if exists t1;
+Warnings:
+Note 1051 Unknown table 't1'
create table t1 (n int);
reset master;
stop slave;
change master to master_port=SLAVE_PORT;
show slave status;
-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 Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
-127.0.0.1 root SLAVE_PORT 1 4 slave-relay-bin.001 4 No No 0 0 0 #
+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 SLAVE_PORT 1 4 slave-relay-bin.000001 4 No No # 0 0 0 4 None 0 No NULL
start slave;
insert into t1 values (1);
select * from t1;