bzr commit into mysql-6.0 branch (patrick.crews:2841) Bug#38311

[Patrick Crews]

#At file:///Users/pcrews/usr/local/bin/data1/work/outfile/mysql-6.0-bugteam/

 2841 Patrick Crews	2008-10-02
      bug#38311 Some tests use 'rm' which is not portable
      Fix for broken Pushbuild  will skip the test rather than failing (embedded server)
modified:
  mysql-test/include/have_outfile.inc
  mysql-test/t/outfile.test

=== modified file 'mysql-test/include/have_outfile.inc'
--- a/mysql-test/include/have_outfile.inc	2008-07-04 18:48:25 +0000
+++ b/mysql-test/include/have_outfile.inc	2008-10-02 14:22:19 +0000
@@ -1,5 +1,8 @@
 -- require r/have_outfile.require
-disable_query_log;
+select @tmpdir;
+
+#disable_query_log;
+select concat(@tmpdir,'/outfile.test');
 select load_file(concat(@tmpdir,'/outfile.test'));
 --remove_file $MYSQLTEST_VARDIR/tmp/outfile.test
-enable_query_log;
+#enable_query_log;

=== modified file 'mysql-test/t/outfile.test'
--- a/mysql-test/t/outfile.test	2008-09-30 20:14:37 +0000
+++ b/mysql-test/t/outfile.test	2008-10-02 14:22:19 +0000
@@ -3,7 +3,7 @@ disable_query_log;
 # Server are started in "var/master-data", so "../tmp" will be "var/tmp"
 eval set @tmpdir="../tmp";
 enable_query_log;
-#-- source include/have_outfile.inc
+-- source include/have_outfile.inc
 
 #
 # test of into outfile|dumpfile