diff options
| author | unknown <aelkin@mysql.com> | 2006-04-08 18:51:29 +0300 |
|---|---|---|
| committer | unknown <aelkin@mysql.com> | 2006-04-08 18:51:29 +0300 |
| commit | 474c5026273790887578c8340e0e781c33f4c73b (patch) | |
| tree | 55cafb8b00d3186a7f6440610cc8d11c1ef4bcfb /mysql-test/include | |
| parent | 53731b7e6984ba9330ed8b7e52936d8f161b9e02 (diff) | |
| parent | e44359014a3bc5cd2eae77b6f5fa43322d0b1f99 (diff) | |
| download | mariadb-git-474c5026273790887578c8340e0e781c33f4c73b.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
mysql-test/r/rpl_temporary.result:
Auto merged
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/get_binlog_dump_thread_id.inc | 4 |
1 files changed, 3 insertions, 1 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; |