summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.pl
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-05-04 19:23:23 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2011-05-04 19:23:23 +0300
commit10afe0993ed3f547b74fcc637b9553eeb3ab6992 (patch)
tree85fbcc1b777780693584bf98dc1a4a4758aa29d5 /mysql-test/mysql-test-run.pl
parenta32df762d43c29545718e8a78a1721a9a7a1a35f (diff)
downloadmariadb-git-10afe0993ed3f547b74fcc637b9553eeb3ab6992.tar.gz
Addendum to bug #11764517 : don't create links for --mem directory, move the --vardir instead.
The new --secure-file-priv checks dereference any symlinks in the paths and compare the resolved paths. Thus the 5.0 test suite must do as the 5.1 and up and avoid using symlinks.
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-xmysql-test/mysql-test-run.pl4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f43cadd3784..203f964c72e 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -873,6 +873,10 @@ sub command_line_setup () {
last;
}
}
+
+ # point vardir to the mem location
+ $opt_vardir= $opt_mem;
+ undef $opt_mem;
}
# --------------------------------------------------------------------------