diff options
| author | kent@kent-amd64.(none) <> | 2007-03-20 17:58:30 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2007-03-20 17:58:30 +0100 |
| commit | a149769b2da4145ef12d6f3d57bb27dd6fa274e8 (patch) | |
| tree | 8163c1306e6b7ceebe77cc93d6b8777df71fa9a6 /mysql-test/r/loaddata.result | |
| parent | a947708760a572e44584b929991d6caded82dee7 (diff) | |
| parent | aab816e7796a54f683df18498e14e7fe4832b742 (diff) | |
| download | mariadb-git-a149769b2da4145ef12d6f3d57bb27dd6fa274e8.tar.gz | |
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
Diffstat (limited to 'mysql-test/r/loaddata.result')
| -rw-r--r-- | mysql-test/r/loaddata.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index c8fcdf14ea0..eb3418f1f18 100644 --- a/mysql-test/r/loaddata.result +++ b/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); |