bk commit into 5.0 tree (msvensson:1.2278)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 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, 2006-09-19 19:11:41+02:00, msvensson@shellback.(none) +1 -0
  Merge shellback.(none):/home/msvensson/mysql/work/my50-work
  into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
  MERGE: 1.2261.7.14

  mysql-test/mysql-test-run.pl@stripped, 2006-09-19 19:11:38+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.113.1.3

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.116/mysql-test/mysql-test-run.pl	2006-09-19 19:11:47 +02:00
+++ 1.117/mysql-test/mysql-test-run.pl	2006-09-19 19:11:47 +02:00
@@ -1720,14 +1720,15 @@
 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 )
@@ -1803,6 +1804,12 @@
   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);
@@ -2399,7 +2406,7 @@
 
 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;
@@ -2628,7 +2635,7 @@
 ##############################################################################
 
 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;
@@ -2649,7 +2656,7 @@
   }
   else
   {
-    $exe= $exe_mysqld;
+    mtr_error("Unknown 'type' passed to mysqld_start");
   }
 
   mtr_init_args(\$args);