bk commit into 5.1 tree (acurtis:1.2600)

[antony]

Below is the list of changes that have just been committed into a local
5.1 repository of antony. When antony 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-09-08 11:56:55-07:00, acurtis@stripped +5 -0
  perform explicit cleanup
  add missing opt file

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@stripped, 2007-09-08 11:56:50-07:00, acurtis@stripped +7 -1
    explicit post-test cleanup

  mysql-test/suite/rpl/r/rpl_innodb_bug30888.result@stripped, 2007-09-08 11:56:50-07:00, acurtis@stripped +2 -0
    explicit post-test cleanup

  mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt@stripped, 2007-09-08 11:56:50-07:00, acurtis@stripped +1 -0
    New BitKeeper file ``mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt''

  mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt@stripped, 2007-09-08 11:56:50-07:00, acurtis@stripped +0 -0

  mysql-test/suite/rpl/t/rpl_innodb_bug28430.test@stripped, 2007-09-08 11:56:50-07:00, acurtis@stripped +8 -3
    explicit post-test cleanup

  mysql-test/suite/rpl/t/rpl_innodb_bug30888.test@stripped, 2007-09-08 11:56:50-07:00, acurtis@stripped +6 -2
    explicit post-test cleanup

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-09-08 11:19:31 -07:00
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2007-09-08 11:56:50 -07:00
@@ -115,7 +115,7 @@ Create Table	CREATE TABLE `byrange_tbl` 
   `fkid` mediumint(9) DEFAULT NULL,
   `filler` varchar(255) DEFAULT NULL,
   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) */
+) ENGINE=InnoDB AUTO_INCREMENT=9 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	Waiting for master to send event
 Master_Host	127.0.0.1
@@ -161,3 +161,9 @@ SELECT count(*) "Slave bykey" FROM test.
 Slave bykey	811
 SELECT count(*) "Slave byrange" FROM test.byrange_tbl;
 Slave byrange	996
+DROP PROCEDURE test.proc_norm;
+DROP PROCEDURE test.proc_bykey;
+DROP PROCEDURE test.proc_byrange;
+DROP TABLE test.regular_tbl;
+DROP TABLE test.bykey_tbl;
+DROP TABLE test.byrange_tbl;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result b/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result	2007-09-08 11:19:32 -07:00
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result	2007-09-08 11:56:50 -07:00
@@ -33,3 +33,5 @@ SET del_count = del_count - 2;
 END WHILE;
 END|
 CALL test.proc_norm();
+DROP PROCEDURE test.proc_norm;
+DROP TABLE test.regular_tbl;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt	2007-09-08 11:56:50 -07:00
@@ -0,0 +1 @@
+--innodb --innodb_autoinc_lock_mode=0
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-09-08 11:19:32 -07:00
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test	2007-09-08 11:56:50 -07:00
@@ -145,7 +145,12 @@ SELECT count(*) "Slave norm" FROM test.r
 SELECT count(*) "Slave bykey" FROM test.bykey_tbl;
 SELECT count(*) "Slave byrange" FROM test.byrange_tbl;
 
---source include/master-slave-end.inc
 connection master;
-DROP DATABASE IF EXISTS test;
-CREATE DATABASE test;
+DROP PROCEDURE test.proc_norm;
+DROP PROCEDURE test.proc_bykey;
+DROP PROCEDURE test.proc_byrange;
+DROP TABLE test.regular_tbl;
+DROP TABLE test.bykey_tbl;
+DROP TABLE test.byrange_tbl;
+
+--source include/master-slave-end.inc
diff -Nrup a/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test b/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
--- a/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test	2007-09-08 11:19:32 -07:00
+++ b/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test	2007-09-08 11:56:50 -07:00
@@ -59,7 +59,11 @@ delimiter ;|
 
 CALL test.proc_norm();
 
-#--source include/master-slave-end.inc
 --sync_slave_with_master
-connection slave;
+
+connection master;
+DROP PROCEDURE test.proc_norm;
+DROP TABLE test.regular_tbl;
+
+--source include/master-slave-end.inc