From 87a93a3195c40e9964da45ae3f1b159640b3b0e3 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 28 Apr 2004 18:24:46 +0200 Subject: A new option --replicate-same-server-id to force a slave to execute queries originating from itself (WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is (some sort of trigger). Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT" sql/mysqld.cc: new option --replicate-same-server-id sql/slave.cc: new option replicate_same_server_id, to force a slave to execute its own queries. Small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT" sql/slave.h: new option --replicate-same-server-id --- mysql-test/r/rpl_server_id2.result | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 mysql-test/r/rpl_server_id2.result (limited to 'mysql-test/r/rpl_server_id2.result') diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/r/rpl_server_id2.result new file mode 100644 index 00000000000..0f484865d7e --- /dev/null +++ b/mysql-test/r/rpl_server_id2.result @@ -0,0 +1,21 @@ +slave stop; +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; +drop table if exists t1; +create table t1 (n int); +reset master; +stop slave; +change master to master_port=9307; +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 # +start slave; +insert into t1 values (1); +select * from t1; +n +1 +1 +drop table t1; -- cgit v1.2.1 From 2a5d6bdc3955936f97bfd067eae7b2f9a30f87fb Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 28 Apr 2004 23:43:46 +0200 Subject: Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port independency of the result file). mysql-test/r/rpl_server_id1.result: be port-independent mysql-test/r/rpl_server_id2.result: be port-independent mysql-test/t/rpl_error_ignored_table.test: we want to sleep 2 secs, not more; if we allow ourselves to sleep >=10 seconds, then the get_lock() will be aborted and we will arrive to late for the KILL to have the desired effect of generating an error code in the binlog. mysql-test/t/rpl_server_id1.test: be port-independent mysql-test/t/rpl_server_id2.test: be port-independent --- mysql-test/r/rpl_server_id2.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysql-test/r/rpl_server_id2.result') diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/r/rpl_server_id2.result index 0f484865d7e..5f4ec9df4c4 100644 --- a/mysql-test/r/rpl_server_id2.result +++ b/mysql-test/r/rpl_server_id2.result @@ -8,7 +8,7 @@ drop table if exists t1; create table t1 (n int); reset master; stop slave; -change master to master_port=9307; +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 # -- cgit v1.2.1