bzr commit into mysql-6.0-codebase-bugfixing branch (aelkin:3885) Bug#50316

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/mysql-6.0-codebase-bugfixing/ based on revid:aelkin@stripped

 3885 Andrei Elkin	2010-05-19 [merge]
      merging from next-mr: failing parts.rpl_partition for bug#50316

    modified:
      mysql-test/suite/parts/r/rpl_partition.result
      mysql-test/suite/parts/t/rpl_partition.test
=== modified file 'mysql-test/suite/parts/r/rpl_partition.result'
--- a/mysql-test/suite/parts/r/rpl_partition.result	2010-01-13 06:34:01 +0000
+++ b/mysql-test/suite/parts/r/rpl_partition.result	2010-05-19 05:11:28 +0000
@@ -190,6 +190,7 @@ Last_SQL_Errno	0
 Last_SQL_Error	
 Replicate_Ignore_Server_Ids	
 Master_Server_Id	1
+Master_Info_File	#
 SELECT count(*) "Slave norm" FROM t1;
 Slave norm	500
 SELECT count(*) "Slave bykey" FROM t2;

=== modified file 'mysql-test/suite/parts/t/rpl_partition.test'
--- a/mysql-test/suite/parts/t/rpl_partition.test	2009-07-15 16:41:02 +0000
+++ b/mysql-test/suite/parts/t/rpl_partition.test	2010-05-19 05:06:13 +0000
@@ -158,7 +158,7 @@ SELECT count(*) as "Master byrange" FROM
 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 #
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
 show slave status;
 SELECT count(*) "Slave norm" FROM t1;
 SELECT count(*) "Slave bykey" FROM t2;


Attachment: [text/bzr-bundle] bzr/[e-mail]