Commit 92384c67 authored by unknown's avatar unknown

Fix bug#27212, test case "loaddata": Take the file to read from the binary package.


mysql-test/r/loaddata.result:
  Fix bug#27212:  Do not try to read a file which is not contained in a binary distribution,
  because it will be missing when the tests are run during release build or by a customer.
mysql-test/t/loaddata.test:
  Fix bug#27212:  Do not try to read a file which is not contained in a binary distribution,
  because it will be missing when the tests are run during release build or by a customer.
parent 19ab799d
...@@ -148,11 +148,11 @@ MYSQLTEST_VARDIR/ ...@@ -148,11 +148,11 @@ MYSQLTEST_VARDIR/
set @@secure_file_priv= 0; set @@secure_file_priv= 0;
ERROR HY000: Variable 'secure_file_priv' is a read only variable ERROR HY000: Variable 'secure_file_priv' is a read only variable
truncate table t1; 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 ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement
select * from t1; select * from t1;
a b c a b c
select load_file("MYSQL_TEST_DIR/Makefile"); select load_file("MYSQL_TEST_DIR/t/loaddata.test");
load_file("MYSQL_TEST_DIR/Makefile") load_file("MYSQL_TEST_DIR/t/loaddata.test")
NULL NULL
drop table t1, t2; drop table t1, t2;
...@@ -126,12 +126,12 @@ set @@secure_file_priv= 0; ...@@ -126,12 +126,12 @@ set @@secure_file_priv= 0;
truncate table t1; truncate table t1;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
--error 1290 --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; select * from t1;
# Test "load_file" returns NULL # Test "load_file" returns NULL
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --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 # cleanup
drop table t1, t2; drop table t1, t2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment