1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge mysql-5.0-security->mysql-5.1-security

Browse Source
This commit is contained in:
Georgi Kodinov 2011-05-04 15:49:30 +03:00
commit c00c350f14
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/secure_file_priv_win.result
View File

@ -1,6 +1,6 @@
CREATE TABLE t1 (c1 longtext); CREATE TABLE t1 (c1 longtext);
INSERT INTO t1 values ('a'); INSERT INTO t1 values ('a');
SELECT * FROM t1 INTO OUTFILE 'd:/mysql/work/test-5.0-security/mysql-test/var/tmp/B11764517.tmp'; SELECT * FROM t1 INTO OUTFILE 'MYSQL_TMP_DIR/B11764517.tmp';
show global variables like 'secure_file_priv'; show global variables like 'secure_file_priv';
Variable_name Value Variable_name Value
secure_file_priv MYSQL_TMP_DIR/ secure_file_priv MYSQL_TMP_DIR/

2
mysql-test/t/secure_file_priv_win.test
View File

@ -14,7 +14,7 @@ LET $MYSQL_TMP_DIR_LCASE= `SELECT lower('$MYSQL_TMP_DIR')`;
#create the file #create the file
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
eval SELECT * FROM t1 INTO OUTFILE '$MYSQL_TMP_DIR_LCASE/B11764517.tmp'; eval SELECT * FROM t1 INTO OUTFILE '$MYSQL_TMP_DIR/B11764517.tmp';
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
show global variables like 'secure_file_priv'; show global variables like 'secure_file_priv';