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

[Patrick Crews]

 2841 Patrick Crews	2008-10-02
      Bug#38311 Some tests use 'rm' which is not portable
      Fix of commented out line that is causing PB failures (embedded server)
modified:
  mysql-test/t/outfile.test

 2840 Sergey Glukhov	2008-10-02 [merge]
      5.1->6.0 bugteam merge
modified:
  mysql-test/r/create.result
  mysql-test/t/create.test
  sql/mysql_priv.h
  sql/sql_parse.cc
  sql/sql_yacc.yy

=== 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:24:53 +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