1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-02 14:22:51 +03:00

Also copy [mysqld] section to [embedded]

This commit is contained in:
msvensson@pilot.mysql.com
2008-03-12 12:35:30 +01:00
parent 4458b5faa0
commit af585cf4d8
2 changed files with 8 additions and 3 deletions

View File

@ -349,22 +349,27 @@ sub post_check_client_groups {
#
# Generate [embedded] by copying the values
# needed from first [mysqld.<suffix>]
# needed from the default [mysqld] section
# and from first [mysqld.<suffix>]
#
sub post_check_embedded_group {
my ($self, $config)= @_;
return unless $self->{ARGS}->{embedded};
my $mysqld= $config->group('mysqld') or
croak "Can't run with embedded, config has no default mysqld section";
my $first_mysqld= $config->first_like('mysqld.') or
croak "Can't run with embedded, config has no mysqld";
my @no_copy =
(
'log-error', # Embedded server writes stderr to mysqltest's log file
'slave-net-timeout', # Embedded server are not build with replication
);
foreach my $option ( $first_mysqld->options() ) {
foreach my $option ( $mysqld->options(), $first_mysqld->options() ) {
# Don't copy options whose name is in "no_copy" list
next if grep ( $option->name() eq $_, @no_copy);