bk commit into 4.0 tree

[jani]

Below is the list of changes that have just been committed into a
4.0 repository of jani. When jani does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-03-04 23:16:43+02:00, jani@stripped
  Support for running different versions of mysqld with mysqld_multi

  scripts/mysqld_multi.sh
    1.9 02/03/04 23:16:42 jani@stripped +19 -5
    Support for running different versions of mysqld with mysqld_multi

# 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:	jani
# Host:	rhols221.adsl.netsonic.fi
# Root:	/home/my/bk/mysql-4.0

--- 1.8/scripts/mysqld_multi.sh	Thu Jun 28 10:49:15 2001
+++ 1.9/scripts/mysqld_multi.sh	Mon Mar  4 23:16:42 2002
@@ -4,7 +4,7 @@
 use POSIX qw(strftime);
 
 $|=1;
-$VER="2.2";
+$VER="2.3";
 
 $opt_config_file   = undef();
 $opt_example       = 0;
@@ -183,7 +183,7 @@
 
 sub start_mysqlds()
 {
-  my (@groups, $com, $i, @options, $j);
+  my (@groups, $com, $tmp, $i, @options, $j);
 
   if (!$opt_no_log)
   {
@@ -202,11 +202,20 @@
     @options = `$com`;
     chop @options;
 
-    $com = "$mysqld";
-    for ($j = 0; defined($options[$j]); $j++)
+    $com= "$mysqld";
+    for ($j = 0, $tmp= ""; defined($options[$j]); $j++)
     {
-      $com.= " $options[$j]";
+      if ("--mysqld=" eq substr($options[$j], 0, 9))
+      {
+	$options[$j]=~ s/\-\-mysqld\=//;
+	$com= $options[$j];
+      }
+      else
+      {
+	$tmp.= " $options[$j]";
+      }
     }
+    $com.= $tmp;
     $com.= " >> $opt_log 2>&1" if (!$opt_no_log);
     $com.= " &";
     system($com);
@@ -595,6 +604,11 @@
                    to this option also. The options are passed to mysqld. Just
                    make sure you have mysqld in your PATH or fix mysqld_safe.
                    Using: $mysqld
+                   Please note: Since mysqld_multi version 2.3 you can also
+                   give this option in groups [mysqld#]! This will be
+                   recognized as a special option and will not be passed
+                   to the mysqld. This will allow one to start different
+                   mysqld versions with mysqld_multi.
 --no-log           Print to stdout instead of the log file. By default the log
                    file is turned on.
 --password=...     Password for user for mysqladmin.