diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-06 20:28:56 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-06 20:28:56 +0100 |
| commit | 6d48dfae996cc3d78efd757d81ef2f89a6f72d99 (patch) | |
| tree | a4a58afcdf82480522171b97a7998848f202e333 /mysql-test/lib | |
| parent | 2bcb4184ef5598f6fcb4fd1aa53eca1a8cb6ecb2 (diff) | |
| download | mariadb-git-6d48dfae996cc3d78efd757d81ef2f89a6f72d99.tar.gz | |
move --secure-file-priv from hardcoded to a template. remove redundant suite.opt
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 73bad5bd81d..3e6221f5e4c 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -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 }, |