bk commit into 5.1 tree (holyfoot:1.2517)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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-06-27 09:58:58+05:00, holyfoot@stripped +2 -0
  rpl_partition.test fixed

  mysql-test/r/rpl_partition.result@stripped, 2007-06-27 09:58:56+05:00, holyfoot@stripped +10
-10
    result fixed

  mysql-test/t/rpl_partition.test@stripped, 2007-06-27 09:58:56+05:00, holyfoot@stripped +2 -0
    machine-depending lines hidden in result

diff -Nrup a/mysql-test/r/rpl_partition.result b/mysql-test/r/rpl_partition.result
--- a/mysql-test/r/rpl_partition.result	2007-06-26 15:36:36 +05:00
+++ b/mysql-test/r/rpl_partition.result	2007-06-27 09:58:56 +05:00
@@ -145,15 +145,15 @@ Create Table	CREATE TABLE `t3` (
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE (id)
SUBPARTITION BY HASH (id) SUBPARTITIONS 2 (PARTITION pa1 VALUES LESS THAN (10) ENGINE =
MyISAM, PARTITION pa2 VALUES LESS THAN (20) ENGINE = MyISAM, PARTITION pa3 VALUES LESS
THAN (30) ENGINE = MyISAM, PARTITION pa4 VALUES LESS THAN (40) ENGINE = MyISAM, PARTITION
pa5 VALUES LESS THAN (50) ENGINE = MyISAM, PARTITION pa6 VALUES LESS THAN (60) ENGINE =
MyISAM, PARTITION pa7 VALUES LESS THAN (70) ENGINE = MyISAM, PARTITION pa8 VALUES LESS
THAN (80) ENGINE = MyISAM, PARTITION pa9 VALUES LESS THAN (90) ENGINE = MyISAM, PARTITION
pa10 VALUES LESS THAN (100) ENGINE = MyISAM, PARTITION pa11 VALUES LESS THAN MAXVALUE
ENGINE = MyISAM) */
 show slave status;
-Slave_IO_State	Waiting for master to send event
+Slave_IO_State	#
 Master_Host	127.0.0.1
 Master_User	root
-Master_Port	9306
+Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	876369
-Relay_Log_File	slave-relay-bin.000003
-Relay_Log_Pos	876515
+Read_Master_Log_Pos	#
+Relay_Log_File	#
+Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
 Slave_IO_Running	Yes
 Slave_SQL_Running	Yes
@@ -166,8 +166,8 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	876369
-Relay_Log_Space	876670
+Exec_Master_Log_Pos	#
+Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
 Until_Log_Pos	0
@@ -177,10 +177,10 @@ Master_SSL_CA_Path	
 Master_SSL_Cert	
 Master_SSL_Cipher	
 Master_SSL_Key	
-Seconds_Behind_Master	0
+Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
+Last_IO_Errno	#
+Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
 SELECT count(*) "Slave norm" FROM t1;
diff -Nrup a/mysql-test/t/rpl_partition.test b/mysql-test/t/rpl_partition.test
--- a/mysql-test/t/rpl_partition.test	2007-06-26 15:36:36 +05:00
+++ b/mysql-test/t/rpl_partition.test	2007-06-27 09:58:56 +05:00
@@ -141,6 +141,8 @@ SELECT count(*) as "Master byrange" FROM
 --sync_slave_with_master
 connection slave;
 show create table t3; 
+--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
 show slave status;
 SELECT count(*) "Slave norm" FROM t1;
 SELECT count(*) "Slave bykey" FROM t2;