bzr push into mysql-trunk branch (mattias.jonsson:3826 to 3827) Bug#13717277

[Mattias Jonsson]

 3827 Mattias Jonsson	2012-05-13
      Bug#13717277: MAIN.PARTITION_BINLOG IS FAILING ON WEEKLY TRUNK.
      
      Fixed by adding RESET MASTER, to truncate the binlog and reset the
      number to 1.

    modified:
      mysql-test/r/partition_binlog.result
      mysql-test/t/partition_binlog.test
 3826 Vasil Dimov	2012-05-11
      During stats rename try to delete the existent rows if UPDATE
      returns a duplicate key error and retry the operation a few
      times because transactions with trx->mysql_thd == NULL are not
      allowed to wait and could easily get lock wait timeout.
      
      Overwriting existent rows in the stats tables during rename is important
      because ALTER table that recreates the table will fail to rename the stats
      properly. Internally InnoDB sees a new (temp) table being created and later
      renamed to the real table, while the real table's stats are still in the
      stats tables.

    modified:
      mysql-test/suite/innodb/r/innodb_stats_rename_table_if_exists.result
      mysql-test/suite/innodb/t/innodb_stats_rename_table_if_exists.test
      storage/innobase/dict/dict0stats.cc
      storage/innobase/handler/ha_innodb.cc
=== modified file 'mysql-test/r/partition_binlog.result'
--- a/mysql-test/r/partition_binlog.result	revid:vasil.dimov@stripped
+++ b/mysql-test/r/partition_binlog.result	revid:mattias.jonsson@stripped
@@ -8,6 +8,7 @@ PARTITION BY RANGE (id)
 (PARTITION p0 VALUES LESS THAN (100),
 PARTITION pmax VALUES LESS THAN (MAXVALUE));
 INSERT INTO t1 VALUES (1), (10), (100), (1000);
+RESET MASTER;
 ALTER TABLE t1 TRUNCATE PARTITION p1;
 ERROR HY000: Incorrect partition name
 ALTER TABLE t1 DROP PARTITION p1;

=== modified file 'mysql-test/t/partition_binlog.test'
--- a/mysql-test/t/partition_binlog.test	revid:vasil.dimov@stripped
+++ b/mysql-test/t/partition_binlog.test	revid:mattias.jonsson@stripped
@@ -17,6 +17,8 @@ PARTITION BY RANGE (id)
 
 INSERT INTO t1 VALUES (1), (10), (100), (1000);
 
+RESET MASTER;
+
 --let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1)
 --let $binlog_start=query_get_value(SHOW MASTER STATUS, Position, 1)
 

No bundle (reason: useless for push emails).