From: Date: August 20 2008 12:13pm Subject: bzr push into mysql-6.0 branch (sven:2770 to 2771) List-Archive: http://lists.mysql.com/commits/52024 X-Bug: Message-Id: <20080820101307.D4B41B715D@riska> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 2771 Sven Sandberg 2008-08-18 empty commit to force pushbuild to rebuild 2770 Sven Sandberg 2008-08-18 [merge] merge 6.0-rpl-testfixes -> 6.0 The following conflicts were resolved manually: Path conflict: / mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt Conflict adding file mysql-test/t/innodb_bug35220.test. Moved existing file to mysql-test/t/innodb_bug35220.test.moved. removed: mysql-test/t/innodb_bug35220.test added: mysql-test/t/innodb_bug35220.test === removed file 'mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt' --- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt 2007-06-27 12:28:02 +0000 +++ b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ ---binlog-format=row === removed file 'mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt' --- a/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt 2007-06-27 12:28:02 +0000 +++ b/mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ ---binlog-format=statement --log-slave-updates === removed file 'mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt' --- a/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt 2008-06-26 05:18:28 +0000 +++ b/mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt 1970-01-01 00:00:00 +0000 @@ -1 +0,0 @@ ---binlog-format=mixed === modified file 'tests/mysql_client_test.c' --- a/tests/mysql_client_test.c 2008-08-14 09:49:56 +0000 +++ b/tests/mysql_client_test.c 2008-08-18 18:12:46 +0000 @@ -17623,7 +17623,6 @@ static void test_wl4166_2() } - /** Test how warnings generated during assignment of parameters are (currently not) preserve in case of reprepare.