1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


mysql-test/suite/rpl/r/rpl_misc_functions.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_misc_functions.test:
  Merge 5.0->5.1
mysql-test/t/sp.test:
  Merge 5.0->5.1
This commit is contained in:
unknown
2007-06-29 10:45:12 +02:00
4 changed files with 45 additions and 27 deletions

View File

@ -1,5 +1,5 @@
-- require r/have_outfile.require
disable_query_log;
select load_file(concat(@tmpdir,"/outfile.test"));
--exec rm $MYSQLTEST_VARDIR/tmp/outfile.test
--remove_file $MYSQLTEST_VARDIR/tmp/outfile.test
enable_query_log;