database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build

Browse Source 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
This commit is contained in:
kent@kent-amd64.(none)
2007-03-20 17:58:30 +01:00
parent a947708760 aab816e779
commit a149769b2d
21 changed files with 143 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/loaddata.result
View File

@ -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);