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-05-07 12:57:07+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 and result file needed to be updated too.

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@stripped, 2008-05-07 12:57:06+02:00,
sven@riska.(none) +0 -39
    Updated result file.

  mysql-test/suite/rpl/t/disabled.def@stripped, 2008-05-07 12:57:06+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-05-07 12:57:06+02:00,
sven@riska.(none) +0 -1
    show slave status is not needed since we have select count(*)

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-05-07 12:57:06 +02:00
@@ -114,45 +114,6 @@ Create Table	CREATE TABLE `byrange_tbl` 
   `filler` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1001 DEFAULT CHARSET=latin1 /*!50100 PARTITION BY RANGE
(id) SUBPARTITION BY HASH (id) SUBPARTITIONS 2 (PARTITION pa1 VALUES LESS THAN (10)
ENGINE = InnoDB, PARTITION pa2 VALUES LESS THAN (20) ENGINE = InnoDB, PARTITION pa3
VALUES LESS THAN (30) ENGINE = InnoDB, PARTITION pa4 VALUES LESS THAN (40) ENGINE =
InnoDB, PARTITION pa5 VALUES LESS THAN (50) ENGINE = InnoDB, PARTITION pa6 VALUES LESS
THAN (60) ENGINE = InnoDB, PARTITION pa7 VALUES LESS THAN (70) ENGINE = InnoDB, PARTITION
pa8 VALUES LESS THAN (80) ENGINE = InnoDB, PARTITION pa9 VALUES LESS THAN (90) ENGINE =
InnoDB, PARTITION pa10 VALUES LESS THAN (100) ENGINE = InnoDB, PARTITION pa11 VALUES LESS
THAN MAXVALUE ENGINE = InnoDB) */
-SHOW SLAVE STATUS;
-Slave_IO_State	#
-Master_Host	127.0.0.1
-Master_User	root
-Master_Port	MASTER_PORT
-Connect_Retry	1
-Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	945470
-Relay_Log_File	#
-Relay_Log_Pos	#
-Relay_Master_Log_File	master-bin.000001
-Slave_IO_Running	Yes
-Slave_SQL_Running	Yes
-Replicate_Do_DB	
-Replicate_Ignore_DB	
-Replicate_Do_Table	
-Replicate_Ignore_Table	#
-Replicate_Wild_Do_Table	
-Replicate_Wild_Ignore_Table	
-Last_Errno	0
-Last_Error	
-Skip_Counter	0
-Exec_Master_Log_Pos	945470
-Relay_Log_Space	#
-Until_Condition	None
-Until_Log_File	
-Until_Log_Pos	0
-Master_SSL_Allowed	No
-Master_SSL_CA_File	
-Master_SSL_CA_Path	
-Master_SSL_Cert	
-Master_SSL_Cipher	
-Master_SSL_Key	
-Seconds_Behind_Master	#
-Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	#
-Last_IO_Error	#
-Last_SQL_Errno	0
-Last_SQL_Error	
 SELECT count(*) "Slave norm" FROM test.regular_tbl;
 Slave norm	500
 SELECT count(*) "Slave bykey" FROM test.bykey_tbl;
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-03-29 13:01:55 +01:00
+++ b/mysql-test/suite/rpl/t/disabled.def	2008-05-07 12:57:06 +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-05-07 12:57:06 +02:00
@@ -136,7 +136,6 @@ SELECT count(*) as "Master byrange" FROM
 --sync_slave_with_master
 connection slave;
 show create table test.byrange_tbl;
-source include/show_slave_status.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;