diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-21 12:18:33 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-21 12:18:33 +0200 |
| commit | b738a5e57e093fbeba18f370a25c406ea7e92446 (patch) | |
| tree | 4edc2ea83650110723306917be528892f911b1eb /mysql-test/lib/My | |
| parent | d25a26268c795413cb367cf1af1e867c23696330 (diff) | |
| parent | ac2a0348a24f501fdd2ffb1dcf3bde5d3ce101db (diff) | |
| download | mariadb-git-b738a5e57e093fbeba18f370a25c406ea7e92446.tar.gz | |
merge from next-mr
Diffstat (limited to 'mysql-test/lib/My')
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index c1e8f7cd826..505f93f1fec 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -39,7 +39,7 @@ sub fix_charset_dir { sub fix_language { my ($self, $config, $group_name, $group)= @_; return my_find_dir($self->get_basedir($group), - \@share_locations, "english"); + \@share_locations); } sub fix_datadir { @@ -197,7 +197,7 @@ my @mysqld_rules= { 'basedir' => sub { return shift->{ARGS}->{basedir}; } }, { 'tmpdir' => \&fix_tmpdir }, { 'character-sets-dir' => \&fix_charset_dir }, - { 'language' => \&fix_language }, + { 'lc-messages-dir' => \&fix_language }, { 'datadir' => \&fix_datadir }, { 'pid-file' => \&fix_pidfile }, { '#host' => \&fix_host }, |