From 883a3809c9cf21f9f727cce738527e02f2b9a653 Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Tue, 19 Sep 2006 18:39:04 +0200
Subject: [PATCH] Pass --debug arguments to mysqld also when bootstrapping if
 --debug is tunrned on

---
 mysql-test/mysql-test-run.pl | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 1b5ac396e95..0928918dd62 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1724,14 +1724,15 @@ sub initialize_servers () {
 sub mysql_install_db () {
 
   # FIXME not exactly true I think, needs improvements
-  install_db('master', $master->[0]->{'path_myddir'});
-  install_db('master', $master->[1]->{'path_myddir'});
+  install_db('master1', $master->[0]->{'path_myddir'});
+
+  install_db('master2', $master->[1]->{'path_myddir'});
 
   if ( $use_slaves )
   {
-    install_db('slave',  $slave->[0]->{'path_myddir'});
-    install_db('slave',  $slave->[1]->{'path_myddir'});
-    install_db('slave',  $slave->[2]->{'path_myddir'});
+    install_db('slave1',  $slave->[0]->{'path_myddir'});
+    install_db('slave2',  $slave->[1]->{'path_myddir'});
+    install_db('slave3',  $slave->[2]->{'path_myddir'});
   }
 
   if ( ! $opt_skip_im )
@@ -1807,6 +1808,12 @@ sub install_db ($$) {
   mtr_add_arg($args, "--skip-ndbcluster");
   mtr_add_arg($args, "--skip-bdb");
 
+  if ( $opt_debug )
+  {
+    mtr_add_arg($args, "--debug=d:t:i:A,%s/log/bootstrap_%s.trace",
+		$opt_vardir_trace, $type);
+  }
+
   if ( ! $opt_netware )
   {
     mtr_add_arg($args, "--language=%s", $path_language);
@@ -2403,7 +2410,7 @@ sub do_before_start_slave ($$) {
 
 sub mysqld_arguments ($$$$$$) {
   my $args=              shift;
-  my $type=              shift;        # master/slave/bootstrap
+  my $type=              shift;        # master/slave
   my $idx=               shift;
   my $extra_opt=         shift;
   my $slave_master_info= shift;
@@ -2632,7 +2639,7 @@ sub mysqld_arguments ($$$$$$) {
 ##############################################################################
 
 sub mysqld_start ($$$$$) {
-  my $type=              shift;        # master/slave/bootstrap
+  my $type=              shift;        # master/slave
   my $idx=               shift;
   my $extra_opt=         shift;
   my $slave_master_info= shift;
@@ -2653,7 +2660,7 @@ sub mysqld_start ($$$$$) {
   }
   else
   {
-    $exe= $exe_mysqld;
+    mtr_error("Unknown 'type' passed to mysqld_start");
   }
 
   mtr_init_args(\$args);