summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authoraelkin@mysql.com <>2006-04-09 19:38:59 +0300
committeraelkin@mysql.com <>2006-04-09 19:38:59 +0300
commit5b6708e3baa6bd6cad3066328e000a7ea8129f1f (patch)
treebcb4b46936d69530d573981b9b02159646f3685e /mysql-test/include
parent95d1d4b5c375d648c1c8dd71c8e56926844e662e (diff)
parentf5c527972fd913e3e38ca5850755310b3eed211e (diff)
downloadmariadb-git-5b6708e3baa6bd6cad3066328e000a7ea8129f1f.tar.gz
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/get_binlog_dump_thread_id.inc4
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/include/get_binlog_dump_thread_id.inc b/mysql-test/include/get_binlog_dump_thread_id.inc
index 680807cc3c6..830a88b5db6 100644
--- a/mysql-test/include/get_binlog_dump_thread_id.inc
+++ b/mysql-test/include/get_binlog_dump_thread_id.inc
@@ -3,9 +3,7 @@
drop table if exists t999;
--enable_warnings
create temporary table t999 (f int);
-### --replace_result $MYSQL_TEST_DIR "." #failed on solaris etc bug#18906
---disable_query_log
+--replace_result $MYSQLTEST_VARDIR "."
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;