summaryrefslogtreecommitdiff
path: root/mysql-test/r/loaddata.result
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2007-03-16 19:56:16 +0100
committerunknown <joerg@trift2.>2007-03-16 19:56:16 +0100
commit92384c67442d0e45065093ce2d48d4d5161c3e51 (patch)
tree2b705b21c7c1f0c3baa0af0e4d9125f41d58d8eb /mysql-test/r/loaddata.result
parent19ab799da5a7da5e599ec150843dda2cd3f81fe4 (diff)
downloadmariadb-git-92384c67442d0e45065093ce2d48d4d5161c3e51.tar.gz
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.
Diffstat (limited to 'mysql-test/r/loaddata.result')
-rw-r--r--mysql-test/r/loaddata.result6
1 files changed, 3 insertions, 3 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;