diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-04 15:49:30 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-05-04 15:49:30 +0300 |
| commit | b96d97fd7f25ad7570688cf38b10b4b77a648871 (patch) | |
| tree | b8336638ad5e493ec1e46abe41a62f849b879a85 /mysql-test | |
| parent | e76cd16967242b18a08f2f2a9608c85a6d1699d2 (diff) | |
| parent | 3b52208fe1f4eb62c26870a1263b1f955ffea1da (diff) | |
| download | mariadb-git-b96d97fd7f25ad7570688cf38b10b4b77a648871.tar.gz | |
merge mysql-5.0-security->mysql-5.1-security
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/secure_file_priv_win.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/secure_file_priv_win.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/secure_file_priv_win.result b/mysql-test/r/secure_file_priv_win.result index 497a5d04b1f..d6636aad5d4 100644 --- a/mysql-test/r/secure_file_priv_win.result +++ b/mysql-test/r/secure_file_priv_win.result @@ -1,6 +1,6 @@ CREATE TABLE t1 (c1 longtext); 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'; Variable_name Value secure_file_priv MYSQL_TMP_DIR/ diff --git a/mysql-test/t/secure_file_priv_win.test b/mysql-test/t/secure_file_priv_win.test index 07e012e42b4..a12510974ce 100644 --- a/mysql-test/t/secure_file_priv_win.test +++ b/mysql-test/t/secure_file_priv_win.test @@ -14,7 +14,7 @@ LET $MYSQL_TMP_DIR_LCASE= `SELECT lower('$MYSQL_TMP_DIR')`; #create the file --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 show global variables like 'secure_file_priv'; |