From: Shivji Kumar Jha
Date: December 9 2012 12:20pm
Subject: bzr push into mysql-5.5 branch (shivji.jha:4102 to 4103) Bug#12359942
List-Archive: http://lists.mysql.com/commits/145460
X-Bug: 12359942
Message-Id: <20121209122000.3358.72861.4103@shiv-ThinkPad-T420>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4103 Shivji Kumar Jha	2012-12-09 [merge]
      BUG#12359942 - REPLICATION TEST FROM ENGINE SUITE RPL_ROW_UNTIL TIMES OUT
                   
                   patch to fix post push falures in pb2
                   bzr merge 5.1->5.5
      
      BUG#15872504 - REMOVE MYSQL-TEST/INCLUDE/GET_BINLOG_DUMP_THREAD_ID.INC
                   bzr merge 5.1->5.6

    removed:
      mysql-test/include/get_binlog_dump_thread_id.inc
    modified:
      mysql-test/suite/engines/funcs/r/rpl_row_until.result
 4102 Akhila Maddukuri	2012-12-07
       Bug #15930494 	MYSQLDUMP TEST SOMETIMES FAILS DUE TO MIXING STDOUT AND
      STDERR
      
            Fix: Added a destination file to mysqldump.

    modified:
      mysql-test/r/mysqldump.result
      mysql-test/t/mysqldump.test
=== removed file 'mysql-test/include/get_binlog_dump_thread_id.inc'
--- a/mysql-test/include/get_binlog_dump_thread_id.inc	revid:akhila.x.maddukuri@stripped
+++ b/mysql-test/include/get_binlog_dump_thread_id.inc	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
---exec $MYSQL test -e "show processlist" > $MYSQLTEST_VARDIR/tmp/bl_dump_thread_id
---disable_warnings
-drop table if exists t999;
---enable_warnings
-# Create a table to hold the process list
-create temporary table t999(
-  id int,
-  user char(255),
-  host char(255),
-  db char(255),
-  Command char(255),
-  time int,
-  State char(255),
-  info char(255)
-);
-# Load processlist into table, headers will create seom warnings
---disable_warnings
---replace_result $MYSQLTEST_VARDIR "."
-eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
---enable_warnings
-let $id = `select Id from t999 where Command="Binlog Dump"`;
-drop table t999;

=== modified file 'mysql-test/suite/engines/funcs/r/rpl_row_until.result'
--- a/mysql-test/suite/engines/funcs/r/rpl_row_until.result	revid:akhila.x.maddukuri@stripped
+++ b/mysql-test/suite/engines/funcs/r/rpl_row_until.result	revid:shivji.jha@stripped
@@ -54,8 +54,7 @@ ERROR HY000: Incorrect parameter or comb
 START SLAVE;
 START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=MASTER_LOG_POS;
 Warnings:
-Note    1254    Slave is already running
+Note	1254	Slave is already running
 include/stop_slave.inc
 RESET SLAVE;
 include/rpl_end.inc
-

No bundle (reason: useless for push emails).