bk commit into 5.0 tree (jani:1.1891) BUG#6221

[jani]

Below is the list of changes that have just been committed into a local
5.0 repository of jani. When jani 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
  1.1891 05/04/26 16:16:38 jani@stripped +1 -0
  Fixed Bug#6221, "mysqld_multi doesn't read the init_connect
  option in my.cnf correctly"

  scripts/mysqld_multi.sh
    1.24 05/04/26 16:16:33 jani@stripped +27 -1
    Fixed Bug#6221, "mysqld_multi doesn't read the init_connect
    option in my.cnf correctly"

# 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:	ua141d10.elisa.omakaista.fi
# Root:	/home/my/bk/mysql-5.0

--- 1.23/scripts/mysqld_multi.sh	2005-04-26 14:28:17 +03:00
+++ 1.24/scripts/mysqld_multi.sh	2005-04-26 16:16:33 +03:00
@@ -4,7 +4,7 @@
 use POSIX qw(strftime);
 
 $|=1;
-$VER="2.13";
+$VER="2.14";
 
 $opt_config_file   = undef();
 $opt_example       = 0;
@@ -160,6 +160,31 @@
 }
 
 ####
+#### Quote option argument. Add double quotes around the argument
+#### and escape the following: $, \, "
+#### This function is needed, because my_print_defaults drops possible
+#### quotes, single or double, from in front of an argument and from
+#### the end.
+####
+
+sub quote_opt_arg
+{
+  my ($option)= @_;
+
+  if ($option =~ m/(\-\-[a-zA-Z0-9\_\-]+)=(.*)/)
+  {
+    $option= $1;
+    $arg= $2;
+    $arg=~ s/\\/\\\\/g; # Escape escape character first to avoid doubling.
+    $arg=~ s/\$/\\\$/g;
+    $arg=~ s/\"/\\\"/g;
+    $arg= "\"" . $arg . "\"";
+    $option= $option . "=" . $arg;
+  }
+  return $option;
+}
+
+####
 #### Init log file. Check for appropriate place for log file, in the following
 #### order my_print_defaults mysqld datadir, @datadir@, /var/log, /tmp
 ####
@@ -293,6 +318,7 @@
       else
       {
 	$options[$j]=~ s/;/\\;/g;
+	$options[$j]= quote_opt_arg($options[$j]);
 	$tmp.= " $options[$j]";
       }
     }