1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0

Browse Source 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1


mysql-test/r/rpl_temporary.result:
  Auto merged
This commit is contained in:
unknown 2006-04-08 18:51:29 +03:00
commit 474c502627
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/get_binlog_dump_thread_id.inc
View File

@ -3,7 +3,9 @@
drop table if exists t999; drop table if exists t999;
--enable_warnings --enable_warnings
create temporary table t999 (f int); 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; eval LOAD DATA INFILE "$MYSQLTEST_VARDIR/tmp/bl_dump_thread_id" into table t999;
--enable_query_log
let $id = `select f from t999`; let $id = `select f from t999`;
drop table t999; drop table t999;

1
mysql-test/r/rpl_temporary.result
View File

@ -78,7 +78,6 @@ create temporary table t4 (f int);
create table t5 (f int); create table t5 (f int);
drop table if exists t999; drop table if exists t999;
create temporary table t999 (f int); create temporary table t999 (f int);
LOAD DATA INFILE "./var/tmp/bl_dump_thread_id" into table t999;
drop table t999; drop table t999;
insert into t4 values (1); insert into t4 values (1);
kill `select id from information_schema.processlist where command='Binlog Dump'`; kill `select id from information_schema.processlist where command='Binlog Dump'`;