diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-23 19:22:38 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-23 19:22:38 +0200 |
| commit | eaed26053da306109d93cbce42b3d275c3e62471 (patch) | |
| tree | 8055d6ee835d938d153d0b66caa2bfd55f120ca8 /mysql-test/lib/My | |
| parent | 3e46f488e5034da1557b2d6c18442dd9fdb40138 (diff) | |
| parent | 7de98f2ffbb273b105321fc88bf536a1fd55114a (diff) | |
| download | mariadb-git-eaed26053da306109d93cbce42b3d275c3e62471.tar.gz | |
Merge with base 5.2
Diffstat (limited to 'mysql-test/lib/My')
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index e9571670f8c..e6497e8866a 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -209,6 +209,7 @@ my @mysqld_rules= ( { 'basedir' => sub { return shift->{ARGS}->{basedir}; } }, { 'tmpdir' => \&fix_tmpdir }, + { 'log-basename' => sub { return "mysqld" } }, { 'character-sets-dir' => \&fix_charset_dir }, { 'language' => \&fix_language }, { 'datadir' => \&fix_datadir }, @@ -217,6 +218,7 @@ my @mysqld_rules= { 'port' => \&fix_port }, { '#extra-port' => \&fix_port }, { 'socket' => \&fix_socket }, + { 'log-error' => \&fix_log_error }, { '#log-error' => \&fix_log_error }, { 'general-log' => sub { return 1; } }, { 'general-log-file' => \&fix_log }, @@ -225,6 +227,7 @@ my @mysqld_rules= { '#user' => sub { return shift->{ARGS}->{user} || ""; } }, { '#password' => sub { return shift->{ARGS}->{password} || ""; } }, { 'server-id' => \&fix_server_id, }, + { 'sync-sys' => sub { return 1; } }, # 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 }, |