MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:msvensson Date:March 12 2008 11:35am
Subject:bk commit into 5.1 tree (msvensson:1.2571)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-03-12 12:35:30+01:00, msvensson@stripped +2 -0
  Also copy [mysqld] section to [embedded]

  mysql-test/include/default_mysqld.cnf@stripped, 2008-03-12 12:35:28+01:00, msvensson@stripped +1 -1
    Use --slave-net-timeout instead of --set-variable=slave_net_timeout

  mysql-test/lib/My/ConfigFactory.pm@stripped, 2008-03-12 12:35:28+01:00, msvensson@stripped +7 -2
    Also copy [mysqld] section to [embedded]

diff -Nrup a/mysql-test/include/default_mysqld.cnf b/mysql-test/include/default_mysqld.cnf
--- a/mysql-test/include/default_mysqld.cnf	2007-12-19 17:16:19 +01:00
+++ b/mysql-test/include/default_mysqld.cnf	2008-03-12 12:35:28 +01:00
@@ -15,7 +15,7 @@ max_heap_table_size=        1M
 
 loose-innodb_data_file_path=      ibdata1:10M:autoextend
 
-set-variable=               slave_net_timeout=120
+slave-net-timeout=120
 
 log-bin
 
diff -Nrup a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm
--- a/mysql-test/lib/My/ConfigFactory.pm	2008-02-25 16:41:51 +01:00
+++ b/mysql-test/lib/My/ConfigFactory.pm	2008-03-12 12:35:28 +01:00
@@ -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);
 
Thread
bk commit into 5.1 tree (msvensson:1.2571)msvensson12 Mar