From e44359014a3bc5cd2eae77b6f5fa43322d0b1f99 Mon Sep 17 00:00:00 2001
From: unknown <aelkin@mysql.com>
Date: Sat, 8 Apr 2006 16:29:11 +0300
Subject: [PATCH] #18906: bushbuild reports rpl_temporary fails on solaris,
 AIX, QNX Removing the problematic line from include test file.

mysql-test/include/get_binlog_dump_thread_id.inc:
  replacing replace_result by disable_query_log
mysql-test/r/rpl_temporary.result:
  results
---
 mysql-test/include/get_binlog_dump_thread_id.inc | 4 +++-
 mysql-test/r/rpl_temporary.result                | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mysql-test/include/get_binlog_dump_thread_id.inc b/mysql-test/include/get_binlog_dump_thread_id.inc
index 9efa12c5611..680807cc3c6 100644
--- a/mysql-test/include/get_binlog_dump_thread_id.inc
+++ b/mysql-test/include/get_binlog_dump_thread_id.inc
@@ -3,7 +3,9 @@
 drop table if exists t999;
 --enable_warnings
 create temporary table t999 (f int);
---replace_result $MYSQL_TEST_DIR "."
+### --replace_result $MYSQL_TEST_DIR "."  #failed on solaris etc bug#18906
+--disable_query_log
 eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
+--enable_query_log
 let $id = `select f from t999`;
 drop table t999;
diff --git a/mysql-test/r/rpl_temporary.result b/mysql-test/r/rpl_temporary.result
index 32cd1f16b99..881504f49d0 100644
--- a/mysql-test/r/rpl_temporary.result
+++ b/mysql-test/r/rpl_temporary.result
@@ -93,7 +93,6 @@ create temporary table t4 (f int);
 create table t5 (f int);
 drop table if exists t999;
 create temporary table t999 (f int);
-LOAD DATA INFILE "./var/tmp/bl_dump_thread_id" into table t999;
 drop table t999;
 insert into t4 values (1);
 kill `select id from information_schema.processlist where command='Binlog Dump'`;