From: Luis Soares
Date: April 27 2010 11:38am
Subject: bzr push into mysql-6.0-codebase-bugfixing branch (luis.soares:3841 to
 3842)
List-Archive: http://lists.mysql.com/commits/106632
Message-Id: <0L1J00D459O5E130@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_V7kErPLvkOOUhMIaFNAYXw)"

--Boundary_(ID_V7kErPLvkOOUhMIaFNAYXw)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 3842 Luis Soares	2010-04-27 [merge]
      manual merge from from mysql-next-mr-bugfixing. Removed extra RESET MASTER.

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

    modified:
      sql/CMakeLists.txt
=== modified file 'mysql-test/suite/binlog/t/binlog_tmp_table.test'
--- a/mysql-test/suite/binlog/t/binlog_tmp_table.test	2010-04-20 12:11:25 +0000
+++ b/mysql-test/suite/binlog/t/binlog_tmp_table.test	2010-04-27 11:35:24 +0000
@@ -28,13 +28,14 @@
 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
 
 connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
 connect (master1,127.0.0.1,root,,test,$MASTER_MYPORT,);
-RESET MASTER;
 
 create table foo (a int);
 
@@ -72,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;
@@ -83,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


--Boundary_(ID_V7kErPLvkOOUhMIaFNAYXw)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/luis.soares@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/luis.soares@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: luis.soares@stripped
# target_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\
#   /53101/mysql-6.0-codebase-bugifixing-push/
# testament_sha1: 6f9e40208513158fed1b5ef782df8926167e67e9
# timestamp: 2010-04-27 12:38:55 +0100
# source_branch: file:///home/lsoares/Workspace/bzr/work/bugfixing\
#   /53101/mysql-next-mr-bugfixing-push/
# base_revision_id: alik@stripped
# 
# Begin bundle
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


--Boundary_(ID_V7kErPLvkOOUhMIaFNAYXw)--