Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1821 05/04/27 16:57:52 tomas@stripped +4 -0
Many files:
test bugfixing
mysql-test/t/rpl_ndb_multi.test
1.2 05/04/27 16:57:25 tomas@stripped +3 -2
test bugfixing
mysql-test/t/rpl_ndb_idempotent.test
1.3 05/04/27 16:57:25 tomas@stripped +10 -5
test bugfixing
mysql-test/r/rpl_ndb_multi.result
1.2 05/04/27 16:57:25 tomas@stripped +5 -3
test bugfixing
mysql-test/r/rpl_ndb_idempotent.result
1.3 05/04/27 16:57:25 tomas@stripped +9 -5
test bugfixing
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/wl2325
--- 1.2/mysql-test/r/rpl_ndb_idempotent.result 2005-04-27 14:40:25 +02:00
+++ 1.3/mysql-test/r/rpl_ndb_idempotent.result 2005-04-27 16:57:25 +02:00
@@ -15,8 +15,10 @@
SELECT * FROM t1 ORDER BY c3;
c1 c2 c3
row1 will go away 1
-@the_pos:=Position @the_file:=File
-<the_position> <the_file>
+SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
+FROM cluster_replication.binlog_index WHERE epoch = <the_epoch> ;
+@the_pos:=Position @the_file:=SUBSTRING_INDEX(FILE, '/', -1)
+246 master-bin.000001
INSERT INTO t1 VALUES ("row2","will go away",2),("row3","will change",3),("row4","D",4);
DELETE FROM t1 WHERE c3 = 1;
UPDATE t1 SET c2="should go away" WHERE c3 = 2;
@@ -32,12 +34,14 @@
row4 D 4
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
-Waiting for master to send event 127.0.0.1 root 9306 1 master-bin.000001 1040 slave-relay-bin.000003 1182 master-bin.000001 Yes Yes cluster_replication.binlog_index 0 0 1040 1182 None 0 No 0
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1040 # # master-bin.000001 Yes Yes cluster_replication.binlog_index 0 0 1040 # None 0 No #
STOP SLAVE;
-CHANGE MASTER TO master_log_pos = 246 ;
+CHANGE MASTER TO
+master_log_file = 'master-bin.000001',
+master_log_pos = 246 ;
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 9306 1 master-bin.000001 246 slave-relay-bin.000001 4 master-bin.000001 No No cluster_replication.binlog_index 0 0 246 102 None 0 No NULL
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 246 # # master-bin.000001 No No cluster_replication.binlog_index 0 0 246 # None 0 No #
START SLAVE;
SELECT * FROM t1 ORDER BY c3;
c1 c2 c3
--- 1.1/mysql-test/r/rpl_ndb_multi.result 2005-04-27 16:05:27 +02:00
+++ 1.2/mysql-test/r/rpl_ndb_multi.result 2005-04-27 16:57:25 +02:00
@@ -23,11 +23,13 @@
c1 c2 c3
row1 will go away 1
stop slave;
-SELECT @the_pos:=Position,@the_file:=File FROM cluster_replication.binlog_index WHERE epoch = <the_epoch> ;
-@the_pos:=Position @the_file:=File
-<the_position> <the_file>
+SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
+FROM cluster_replication.binlog_index WHERE epoch = <the_epoch> ;
+@the_pos:=Position @the_file:=SUBSTRING_INDEX(FILE, '/', -1)
+102 master-bin1.000001
CHANGE MASTER TO
master_port=<MASTER_PORT1>,
+master_log_file = 'master-bin1.000001',
master_log_pos = 102 ;
start slave;
INSERT INTO t1 VALUES ("row2","will go away",2),("row3","will change",3),("row4","D",4);
--- 1.2/mysql-test/t/rpl_ndb_idempotent.test 2005-04-27 14:40:25 +02:00
+++ 1.3/mysql-test/t/rpl_ndb_idempotent.test 2005-04-27 16:57:25 +02:00
@@ -21,10 +21,9 @@
# get the master binlog pos from the epoch
connection master;
---replace_column 1 <the_position> 2 <the_file>
---disable_query_log
-eval SELECT @the_pos:=Position,@the_file:=File FROM cluster_replication.binlog_index WHERE epoch = $the_epoch ;
---enable_query_log
+--replace_result $the_epoch <the_epoch>
+eval SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
+ FROM cluster_replication.binlog_index WHERE epoch = $the_epoch ;
let $the_pos= `SELECT @the_pos` ;
let $the_file= `SELECT @the_file` ;
@@ -41,12 +40,18 @@
sync_slave_with_master;
SELECT * FROM t1 ORDER BY c3;
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 1 # 8 # 9 # 23 # 33 #
SHOW SLAVE STATUS;
# stop slave and reset position to before the last changes
STOP SLAVE;
-eval CHANGE MASTER TO master_log_pos = $the_pos ;
+eval CHANGE MASTER TO
+ master_log_file = '$the_file',
+ master_log_pos = $the_pos ;
+--replace_result $MASTER_MYPORT MASTER_PORT
+--replace_column 1 # 8 # 9 # 23 # 33 #
SHOW SLAVE STATUS;
# start the slave again
--- 1.1/mysql-test/t/rpl_ndb_multi.test 2005-04-27 16:05:29 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_multi.test 2005-04-27 16:57:25 +02:00
@@ -32,9 +32,9 @@
# get the master binlog pos from the epoch, from the _other_ "master", server2
connection server2;
---replace_column 1 <the_position> 2 <the_file>
--replace_result $the_epoch <the_epoch>
-eval SELECT @the_pos:=Position,@the_file:=File FROM cluster_replication.binlog_index WHERE epoch = $the_epoch ;
+eval SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
+ FROM cluster_replication.binlog_index WHERE epoch = $the_epoch ;
let $the_pos= `SELECT @the_pos` ;
let $the_file= `SELECT @the_file` ;
@@ -43,6 +43,7 @@
--replace_result $MASTER_MYPORT1 <MASTER_PORT1>
eval CHANGE MASTER TO
master_port=$MASTER_MYPORT1,
+ master_log_file = '$the_file',
master_log_pos = $the_pos ;
start slave;
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.1821) | tomas | 27 Apr |
