bk commit into 5.1 tree (sven:1.2562) BUG#36379

[Sven Sandberg]

Below is the list of changes that have just been committed into a local
5.1 repository of sven.  When sven 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, 2008-04-28 17:48:27+02:00, sven@riska.(none) +3 -0
  BUG#36379: please re-enable rpl_innodb_bug28430
  The test suite/rpl/t/rpl_innodb_bug28430.test was disabled because of
  BUG#32247, but not re-enabled when BUG#32247 was fixed. I've re-enabled
  it. The test does not fail due to the bug any more. However, it fails
  since the result file contains binlog positions that have not been kept
  up to date while the test was disabled. The test is unrelated to binlog
  positions, and hence I'm masking out binlog positions. So both .test and
  .result are updated.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@stripped, 2008-04-28 17:48:24+02:00, sven@riska.(none) +2 -2
    Updated result file.

  mysql-test/suite/rpl/t/disabled.def@stripped, 2008-04-28 17:48:24+02:00, sven@riska.(none) +0 -1
    Enabled the rpl_innodb_bug28430 test case.

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@stripped, 2008-04-28 17:48:24+02:00, sven@riska.(none) +1 -1
    We are not interested in the binlog positions reported by SHOW SLAVE
    STATUS. Hence, we should use include/show_slave_status2.inc instead of
    include/show_slave_status.inc, since the former ignores binlog positions.

diff -Nrup a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2007-12-13 12:49:52 +01:00
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2008-04-28 17:48:24 +02:00
@@ -121,7 +121,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	945470
+Read_Master_Log_Pos	#
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -136,7 +136,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	945470
+Exec_Master_Log_Pos	#
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
--- a/mysql-test/suite/rpl/t/disabled.def	2008-04-03 11:43:25 +02:00
+++ b/mysql-test/suite/rpl/t/disabled.def	2008-04-28 17:48:24 +02:00
@@ -11,7 +11,6 @@
 ##############################################################################
 
 rpl_ddl                  : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
-rpl_innodb_bug28430      : Bug #32247 2007-11-27 mats Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table)
 rpl_view                   : Bug#32654: rpl_view.test fails randomly
 rpl_ndb_multi              : Bug#30751: rpl_ndb_multi missing row in output
 rpl_log_pos                : Bug#8693 Test 'rpl_log_pos' fails sometimes
diff -Nrup a/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test b/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test	2007-11-14 11:01:40 +01:00
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test	2008-04-28 17:48:24 +02:00
@@ -136,7 +136,7 @@ SELECT count(*) as "Master byrange" FROM
 --sync_slave_with_master
 connection slave;
 show create table test.byrange_tbl;
-source include/show_slave_status.inc;
+source include/show_slave_status2.inc;
 SELECT count(*) "Slave norm" FROM test.regular_tbl;
 SELECT count(*) "Slave bykey" FROM test.bykey_tbl;
 SELECT count(*) "Slave byrange" FROM test.byrange_tbl;