move --secure-file-priv from hardcoded to a template. remove redundant suite.opt
This commit is contained in:
parent
2bcb4184ef
commit
6d48dfae99
@ -124,6 +124,7 @@ and values - with templating extensions. They are
|
||||
to values in the [ENV] group of my.cnf file.
|
||||
|
||||
Via the OPT group one can refer to special values:
|
||||
@OPT.plugindir - a path to plugindir
|
||||
@OPT.vardir - a path to vardir
|
||||
@OPT.port - a new port number is reserved out of the pool. It will not
|
||||
match any other port number used by this test run.
|
||||
|
@ -24,6 +24,7 @@ character-set-server= latin1
|
||||
connect-timeout= 60
|
||||
|
||||
plugin-dir=@OPT.plugindir
|
||||
secure-file-priv= @OPT.vardir
|
||||
|
||||
log-basename=mysqld
|
||||
debug-no-sync
|
||||
|
@ -165,13 +165,6 @@ sub fix_log_slow_queries {
|
||||
return "$dir/mysqld-slow.log";
|
||||
}
|
||||
|
||||
sub fix_secure_file_priv {
|
||||
my ($self)= @_;
|
||||
my $vardir= $self->{ARGS}->{vardir};
|
||||
# By default, prevent the started mysqld to access files outside of vardir
|
||||
return $vardir;
|
||||
}
|
||||
|
||||
sub fix_std_data {
|
||||
my ($self, $config, $group_name, $group)= @_;
|
||||
my $testdir= $self->get_testdir($group);
|
||||
@ -244,8 +237,6 @@ my @mysqld_rules=
|
||||
{ '#user' => sub { return shift->{ARGS}->{user} || ""; } },
|
||||
{ '#password' => sub { return shift->{ARGS}->{password} || ""; } },
|
||||
{ 'server-id' => \&fix_server_id, },
|
||||
# By default, prevent the started mysqld to access files outside of vardir
|
||||
{ 'secure-file-priv' => sub { return shift->{ARGS}->{vardir}; } },
|
||||
{ 'ssl-ca' => \&fix_ssl_ca },
|
||||
{ 'ssl-cert' => \&fix_ssl_server_cert },
|
||||
{ 'ssl-key' => \&fix_ssl_server_key },
|
||||
|
@ -1,2 +0,0 @@
|
||||
--secure-file-priv=$MYSQLTEST_VARDIR
|
||||
|
Loading…
x
Reference in New Issue
Block a user