bzr commit into mysql-trunk-bugfixing branch (magne.mahre:3074) Bug#54660

[Magne Mahre]

#At file:///export/home/tmp/x/mysql-trunk-bugfixing/ based on revid:joerg@stripped

 3074 Magne Mahre	2010-06-24
      Bug#54660 MTR cannot start server properly with non-default 
                innodb_log_file_size 
      
      After the implementation of WL#5349, the InnoDB storage
      engine is started earlier in the boot process, and the
      startup parameters that affect file locations and file
      sizes needs to be passed on to the bootstrap process,
      in addition to the database server process.
      
      This patch adds all options that are given to mtr as
      a --mysqld=<option> to the bootstrap command line.

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-06-23 10:17:59 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-06-24 11:20:20 +0000
@@ -2860,6 +2860,15 @@ sub mysql_install_db {
   mtr_add_arg($args, "--lc-messages-dir=%s", $install_lang);
   mtr_add_arg($args, "--character-sets-dir=%s", $install_chsdir);
 
+  # InnoDB arguments that affect file location and sizes may 
+  # need to be given to the bootstrap process as well as the
+  # server process.
+  foreach my $extra_opt ( @opt_extra_mysqld_opt )
+  {
+    if ($extra_opt =~ /--innodb/) {
+      mtr_add_arg($args, $extra_opt);
+    }
+  }
   # If DISABLE_GRANT_OPTIONS is defined when the server is compiled (e.g.,
   # configure --disable-grant-options), mysqld will not recognize the
   # --bootstrap or --skip-grant-tables options.  The user can set


Attachment: [text/bzr-bundle] bzr/[e-mail]