bzr push into mysql-next-mr-bugfixing branch (luis.soares:3156 to 3157)

[Luis Soares]

 3157 Luis Soares	2010-04-27 [merge]
      merge from mysql-trunk-bugfixing

    modified:
      mysql-test/suite/binlog/r/binlog_tmp_table.result
      mysql-test/suite/binlog/t/binlog_tmp_table.test
 3156 Alexander Nozdrin	2010-04-27 [merge]
      Auto-merge from remote repository.

    modified:
      sql/CMakeLists.txt
=== modified file 'mysql-test/suite/binlog/r/binlog_tmp_table.result'
--- a/mysql-test/suite/binlog/r/binlog_tmp_table.result	2010-03-24 15:03:44 +0000
+++ b/mysql-test/suite/binlog/r/binlog_tmp_table.result	2010-04-27 11:25:55 +0000
@@ -1,3 +1,4 @@
+RESET MASTER;
 create table foo (a int);
 flush logs;
 create temporary table tmp1_foo like foo;

=== modified file 'mysql-test/suite/binlog/t/binlog_tmp_table.test'
--- a/mysql-test/suite/binlog/t/binlog_tmp_table.test	2010-04-20 09:10:43 +0000
+++ b/mysql-test/suite/binlog/t/binlog_tmp_table.test	2010-04-27 11:25:55 +0000
@@ -28,6 +28,8 @@
 source include/have_log_bin.inc;
 source include/have_binlog_format_mixed_or_statement.inc;
 
+RESET MASTER;
+
 --disable_query_log
 CALL mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
 --enable_query_log
@@ -71,6 +73,8 @@ truncate table tmp1_foo;
 connection master1;
 truncate table tmp2_foo;
 
+let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
+
 flush logs;
 
 connection default;
@@ -82,7 +86,7 @@ create table foo (a int);
 
 # replay from binary log
 let $MYSQLD_DATADIR= `select @@datadir`;
-exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000002 | $MYSQL;
+exec $MYSQL_BINLOG $MYSQLD_DATADIR/$binlog_file | $MYSQL;
 select * from foo;
 
 # clean up


Attachment: [text/bzr-bundle] bzr/[e-mail]