database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Addendum 3 for bug #BUG#11764517 : expand secure_file_priv to the real

Browse Source 
patch so that it can later be compared with patchs with expanded symlinks
This commit is contained in:
Georgi Kodinov
2011-05-05 12:10:49 +03:00
parent 93f62d51a8
commit 858cf12f89
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@@ -873,10 +873,6 @@ sub command_line_setup () {
last;
}
}
# point vardir to the mem location
$opt_vardir= $opt_mem;
undef $opt_mem;
}
# --------------------------------------------------------------------------

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

@@ -193,12 +193,6 @@ select * from t1;
a b c
10 NULL Ten
15 NULL Fifteen
show variables like "secure_file_pri%";
Variable_name Value
secure_file_priv MYSQLTEST_VARDIR/
select @@secure_file_priv;
@@secure_file_priv
MYSQLTEST_VARDIR/
set @@secure_file_priv= 0;
ERROR HY000: Variable 'secure_file_priv' is a read only variable
truncate table t1;

14
mysql-test/t/loaddata.test
View File

@@ -149,10 +149,16 @@ select * from t1;
#
# It should not be possible to load from a file outside of vardir
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
show variables like "secure_file_pri%";
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
select @@secure_file_priv;
# The following lines were disabled because of patch for
# bug 50373. MYSQLTEST_VARDIR doesn't rewrite symlinks
# to real paths, but this is done for secure_file_priv.
# Because of this the result can't be replaced if the
# test suite runs with the --mem option which creates
# symlinks to the ramdisk.
#--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
#show variables like "secure_file_pri%";
#--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
#select @@secure_file_priv;
--error 1238
set @@secure_file_priv= 0;