Merge trift2.:/MySQL/M50/clone-5.0

into  trift2.:/MySQL/M51/merge-5.1


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged

mysql-test/r/loaddata.result

@@ -157,12 +157,12 @@ MYSQLTEST_VARDIR/
 set @@secure_file_priv= 0;
 ERROR HY000: Variable 'secure_file_priv' is a read only variable
 truncate table t1;
-load data infile 'MYSQL_TEST_DIR/Makefile' into table t1;
+load data infile 'MYSQL_TEST_DIR/t/loaddata.test' into table t1;
 ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement
 select * from t1;
 a	b	c
-select load_file("MYSQL_TEST_DIR/Makefile");
-load_file("MYSQL_TEST_DIR/Makefile")
+select load_file("MYSQL_TEST_DIR/t/loaddata.test");
+load_file("MYSQL_TEST_DIR/t/loaddata.test")
 NULL
 drop table t1, t2;
 CREATE TABLE t1 (a int);

mysql-test/t/loaddata.test

@@ -130,12 +130,12 @@ set @@secure_file_priv= 0;
 truncate table t1;
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --error 1290
-eval load data infile '$MYSQL_TEST_DIR/Makefile' into table t1;
+eval load data infile '$MYSQL_TEST_DIR/t/loaddata.test' into table t1;
 select * from t1;
 
 # Test "load_file" returns NULL
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
-eval select load_file("$MYSQL_TEST_DIR/Makefile");
+eval select load_file("$MYSQL_TEST_DIR/t/loaddata.test");
 
 # cleanup
 drop table t1, t2;