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

mysql-test/include/get_binlog_dump_thread_id.inc

---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;

mysql-test/suite/engines/funcs/r/rpl_row_until.result

@@ -54,8 +54,7 @@ ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UN
 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
-