Commit e9bb8d2f authored by unknown's avatar unknown

Modifying mysql-test-run.pl to allow steeing of --secure-file-priv to 'mysql-test' when

running suites other tha the main one


mysql-test/mysql-test-run.pl:
  Modifying to allow steeing of --secure-file-priv to 'mysql-test' when running suites 
  other tha the main one
parent bfacf22d
...@@ -3642,8 +3642,16 @@ sub mysqld_arguments ($$$$$) { ...@@ -3642,8 +3642,16 @@ sub mysqld_arguments ($$$$$) {
if ( $mysql_version_id >= 50036) if ( $mysql_version_id >= 50036)
{ {
# Prevent the started mysqld to access files outside of vardir # By default, prevent the started mysqld to access files outside of vardir
mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $opt_vardir); my $secure_file_dir= $opt_vardir;
if ( $opt_suite ne "main" )
{
# When running a suite other than default allow the mysqld
# access to subdirs of mysql-test/ in order to make it possible
# to "load data" from the suites data/ directory.
$secure_file_dir= $glob_mysql_test_dir;
}
mtr_add_arg($args, "%s--secure-file-priv=%s", $prefix, $secure_file_dir);
} }
if ( $mysql_version_id >= 50000 ) if ( $mysql_version_id >= 50000 )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment