diff options
| -rw-r--r-- | mysql-test/r/loaddata.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/loaddata.test | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 83c7b37d914..bef483569d4 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -148,11 +148,11 @@ 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; diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index 0dc91c36a09..125a65826ca 100644 --- a/mysql-test/t/loaddata.test +++ b/mysql-test/t/loaddata.test @@ -126,12 +126,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; |