database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix embedded server

Browse Source
This commit is contained in:
msvensson@pilot.mysql.com
2008-02-22 15:38:10 +01:00
parent de4f78d919
commit 0b547b26db
2 changed files with 64 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,7 @@ my @mysqlbinlog_rules=
#
# Generate a [client.<suffix>] group pointing to be
# Generate a [client.<suffix>] group to be
# used for connecting to [mysqld.<suffix>]
#
sub post_check_client_group {
@ -347,6 +347,25 @@ sub post_check_client_groups {
}
#
# Generate [embedded] by copying the values
# needed from first [mysqld.<suffix>]
#
sub post_check_embedded_group {
my ($self, $config)= @_;
return unless $self->{ARGS}->{embedded};
my $first_mysqld= $config->first_like('mysqld.') or
croak "Can't run with embedded, config has no mysqld";
foreach my $option ( $first_mysqld->options() ) {
$config->insert('embedded', $option->name(), $option->value())
}
}
sub resolve_at_variable {
my ($self, $config, $group, $option)= @_;
@ -423,6 +442,7 @@ my @post_rules=
\&post_check_client_groups,
\&post_fix_mysql_cluster_section,
\&post_fix_resolve_at_variables,
\&post_check_embedded_group,
);
@ -567,13 +587,13 @@ sub new_config {
$config->insert('mysqlbinlog'),
@mysqlbinlog_rules);
# Additional reuls required for [client]
# Additional rules required for [client]
$self->run_rules_for_group($config,
$config->insert('client'),
@client_rules);
# Additional reuls required for [mysqltest]
# Additional rules required for [mysqltest]
$self->run_rules_for_group($config,
$config->insert('mysqltest'),
@mysqltest_rules);