bk commit into 5.0 tree (msvensson:1.2446)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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-11 09:06:27+02:00, msvensson@stripped +2 -0
  Add replace_result for things that are not tested

  mysql-test/r/rpl_ssl.result@stripped, 2007-04-11 09:06:25+02:00, msvensson@stripped +2
-2
    Add replace_result for things that are not tested

  mysql-test/t/rpl_ssl.test@stripped, 2007-04-11 09:06:25+02:00, msvensson@stripped +1 -1
    Add replace_result for things that are not tested

# 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:	msvensson
# Host:	pilot.blaudden
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.2/mysql-test/r/rpl_ssl.result	2007-04-10 12:18:59 +02:00
+++ 1.3/mysql-test/r/rpl_ssl.result	2007-04-11 09:06:25 +02:00
@@ -65,7 +65,7 @@ Master_User	replssl
 Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	12320
+Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -80,7 +80,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	12320
+Exec_Master_Log_Pos	#
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	

--- 1.2/mysql-test/t/rpl_ssl.test	2007-04-10 12:18:59 +02:00
+++ 1.3/mysql-test/t/rpl_ssl.test	2007-04-11 09:06:25 +02:00
@@ -57,5 +57,5 @@ connection master;
 insert into t1 values (NULL);
 sync_slave_with_master;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
---replace_column 1 # 8 # 9 # 23 # 33 #
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
 query_vertical show slave status;