1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also copy [mysqld] section to [embedded]

Browse Source 
mysql-test/include/default_mysqld.cnf:
  Use --slave-net-timeout instead of --set-variable=slave_net_timeout
This commit is contained in:
unknown 2008-03-12 12:35:30 +01:00
parent d4eea5b164
commit a4ee24e368
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/include/default_mysqld.cnf
View File

@ -15,7 +15,7 @@ max_heap_table_size= 1M
loose-innodb_data_file_path= ibdata1:10M:autoextend loose-innodb_data_file_path= ibdata1:10M:autoextend
set-variable= slave_net_timeout=120 slave-net-timeout=120
log-bin log-bin

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

@ -349,22 +349,27 @@ sub post_check_client_groups {
# #
# Generate [embedded] by copying the values # 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 { sub post_check_embedded_group {
my ($self, $config)= @_; my ($self, $config)= @_;
return unless $self->{ARGS}->{embedded}; 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 my $first_mysqld= $config->first_like('mysqld.') or
croak "Can't run with embedded, config has no mysqld"; croak "Can't run with embedded, config has no mysqld";
my @no_copy = my @no_copy =
( (
'log-error', # Embedded server writes stderr to mysqltest's log file '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 # Don't copy options whose name is in "no_copy" list
next if grep ( $option->name() eq $_, @no_copy); next if grep ( $option->name() eq $_, @no_copy);