bk commit into 5.1 tree (msvensson:1.2295)

[msvensson]

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, 2006-08-31 20:58:00+02:00, msvensson@shellback.(none) +2 -0
  Only install the first masters db and copy it for the other
  Gives slightly faster startup

  mysql-test/lib/mtr_misc.pl@stripped, 2006-08-31 20:57:56+02:00, msvensson@shellback.(none) +2 -0
    Add verbose message 

  mysql-test/mysql-test-run.pl@stripped, 2006-08-31 20:57:56+02:00, msvensson@shellback.(none) +15 -2
    Only install the first masters db and copy it for the other
    Gives slightly faster startup

# 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.1-new-maint

--- 1.14/mysql-test/lib/mtr_misc.pl	2006-08-31 20:58:11 +02:00
+++ 1.15/mysql-test/lib/mtr_misc.pl	2006-08-31 20:58:11 +02:00
@@ -139,6 +139,8 @@
   my $from_dir= shift;
   my $to_dir= shift;
 
+#  mtr_verbose("Copying from $from_dir to $to_dir");
+
   mkpath("$to_dir");
   opendir(DIR, "$from_dir")
     or mtr_error("Can't find $from_dir$!");

--- 1.160/mysql-test/mysql-test-run.pl	2006-08-31 20:58:11 +02:00
+++ 1.161/mysql-test/mysql-test-run.pl	2006-08-31 20:58:11 +02:00
@@ -357,6 +357,7 @@
 sub initialize_servers ();
 sub mysql_install_db ();
 sub install_db ($$);
+sub copy_install_db ($$);
 sub run_testcase ($);
 sub run_testcase_stop_servers ($$$);
 sub run_testcase_start_servers ($);
@@ -2237,7 +2238,7 @@
 
   # FIXME not exactly true I think, needs improvements
   install_db('master', $master->[0]->{'path_myddir'});
-  install_db('master', $master->[1]->{'path_myddir'});
+  copy_install_db('master', $master->[1]->{'path_myddir'});
 
   if ( $use_slaves )
   {
@@ -2302,6 +2303,18 @@
 }
 
 
+sub copy_install_db ($$) {
+  my $type=      shift;
+  my $data_dir=  shift;
+
+  mtr_report("Installing \u$type Database");
+
+  # Just copy the installed db from first master
+  mtr_copy_dir($master->[0]->{'path_myddir'}, $data_dir);
+
+}
+
+
 sub install_db ($$) {
   my $type=      shift;
   my $data_dir=  shift;
@@ -2456,7 +2469,7 @@
 
   foreach my $instance (@{$instance_manager->{'instances'}})
   {
-    install_db(
+    copy_install_db(
       'im_mysqld_' . $instance->{'server_id'},
       $instance->{'path_datadir'});
   }