bzr commit into mysql-trunk-mtr branch (bjorn.bunch:2956) Bug#54660

[Bjorn Munch]

#At file:///home/bm136801/my/bootinno-tr/ based on revid:bjorn.bunch@stripped

 2956 Bjorn Munch	2010-07-19
      Bug #54660 MTR cannot start server properly with non-default innodb_log_file_size
      The option setting must be passed to the boostrap mysqld
      Add any innodb options specified with --mysqld to the boostrap command

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-07-14 09:28:54 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-07-19 09:16:33 +0000
@@ -2886,6 +2886,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]