bzr push into mysql-5.0-bugteam branch (patrick.crews:2686 to 2687) Bug#38311

[Patrick Crews]

 2687 Patrick Crews	2008-09-30
      Bug#38311  Some tests use 'rm' which is not portable
      
      Repush of change to fix tests on Pushbuild.
modified:
  mysql-test/t/distinct.test

 2686 Patrick Crews	2008-09-30 [merge]
      automerge
modified:
  sql/parse_file.cc
  sql/parse_file.h
  sql/sql_db.cc
  sql/sql_view.cc

=== modified file 'mysql-test/t/distinct.test'
--- a/mysql-test/t/distinct.test	2008-09-23 09:24:32 +0000
+++ b/mysql-test/t/distinct.test	2008-10-01 00:54:06 +0000
@@ -490,6 +490,7 @@ default NULL);
 SELECT DISTINCT fruit_id, fruit_name INTO OUTFILE 
 '../tmp/data1.tmp' FROM t1 WHERE fruit_name = 'APPLE';
 LOAD DATA INFILE '../tmp/data1.tmp' INTO TABLE t2;
+--error 0,1
 --remove_file $MYSQL_TEST_DIR/var/tmp/data1.tmp
 
 SELECT DISTINCT @v19:= fruit_id, @v20:= fruit_name INTO OUTFILE