database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

move --secure-file-priv from hardcoded to a template. remove redundant suite.opt

Browse Source
This commit is contained in:
Sergei Golubchik
2012-02-06 20:28:56 +01:00
parent 2bcb4184ef
commit 6d48dfae99
4 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/lib/My/ConfigFactory.pm
View File

@ -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 },