bk commit into 5.1 tree (mats:1.2554) BUG#25688

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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@stripped, 2007-04-12 14:14:50+02:00, mats@romeo.(none) +2 -0
  BUG#25688 (RBR: circular replication may cause STMT_END_F flags to
  be skipped):
  
  Fixing test since a replace assumed that we were on slave when we were
  on master.

  mysql-test/r/rpl_ndb_circular_simplex.result@stripped, 2007-04-12 14:14:44+02:00,
mats@romeo.(none) +3 -2
    Result file change

  mysql-test/t/rpl_ndb_circular_simplex.test@stripped, 2007-04-12 14:14:44+02:00,
mats@romeo.(none) +2 -2
    Incorrectly used MASTER_PORT instead of SLAVE_PORT for test. (This is
    circular replication, you know. The roles of slave and master is kind
    of blurred. Mea culpa.)

# 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:	mats
# Host:	romeo.(none)
# Root:	/home/bk/w3464-mysql-5.1-new-rpl

--- 1.1/mysql-test/r/rpl_ndb_circular_simplex.result	2007-04-12 14:14:58 +02:00
+++ 1.2/mysql-test/r/rpl_ndb_circular_simplex.result	2007-04-12 14:14:58 +02:00
@@ -19,10 +19,10 @@
 Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	9308
+Master_Port	SLAVE_PORT
 Connect_Retry	60
 Master_Log_File	slave-bin.000001
-Read_Master_Log_Pos	468
+Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	slave-bin.000001
@@ -49,6 +49,7 @@
 Master_SSL_Cipher	
 Master_SSL_Key	
 Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	2

--- 1.1/mysql-test/t/rpl_ndb_circular_simplex.test	2007-04-12 14:14:58 +02:00
+++ 1.2/mysql-test/t/rpl_ndb_circular_simplex.test	2007-04-12 14:14:58 +02:00
@@ -50,8 +50,8 @@
 #SHOW BINLOG EVENTS;
 
 # Check that there is no error in replication
---replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 8 # 9 # 23 # 33 #
+--replace_result $SLAVE_MYPORT SLAVE_PORT
+--replace_column 1 # 7 # 8 # 9 # 23 # 33 #
 query_vertical SHOW SLAVE STATUS;
 
 # Check that we have the data on the master