bk commit into 5.0 tree (igreenhoe:1.2250) BUG#18579

[Ian Greenhoe]

Below is the list of changes that have just been committed into a local
5.0 repository of greenman. When greenman 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-07 15:57:07-07:00, igreenhoe@stripped +1 -0
  Fix for bug #18579 (mysql_install_db script only creates databases
  for first instance in my.cnf)
  
  Problem:  No way to specify for mysql_install_db to use the
  additional instances of configuration information located in the
  my.cnf file.
  
  Solution:  Added support for the --defaults-group-suffix switch,
  which is the switch used in mysqld (and my_print_defaults) to
  select such behavior.  Also contains the mysqld-VERSION group
  (so this patch supersedes the patch for 17979 on version 5.0 and
  up).
  
  Note: mysql_install_db will still only initialize one database at a
  time.  If a site needs to initialize more than one database
  programatically, it is now possible to create a script to do so.

  scripts/mysql_install_db.sh@stripped, 2006-08-07 15:57:03-07:00, igreenhoe@stripped +20 -4
    Added support for --defaults-group-suffix, and for the
    mysqld-VERSION group.

# 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:	igreenhoe
# Host:	anubis.greendragongames.com
# Root:	/home/greenman/workspace-mysql/mysql/bug-5.0-18579

--- 1.64/scripts/mysql_install_db.sh	2006-08-07 15:57:13 -07:00
+++ 1.65/scripts/mysql_install_db.sh	2006-08-07 15:57:13 -07:00
@@ -12,12 +12,27 @@
 windows=0
 defaults=""
 user=""
+defaults_group_suffix=""
 
-case "$1" in
+# find the special arguments and strip them off.
+# the special arguments *must be first* on the command line.
+
+is_done=""
+
+while test :$is_done = :
+do
+  case "$1" in
     --no-defaults|--defaults-file=*|--defaults-extra-file=*)
       defaults="$1"; shift
       ;;
-esac
+    --defaults-group-suffix=*)
+      defaults_group_suffix="$1"; shift
+      ;;
+    *)
+      is_done=1
+      ;;
+  esac
+done
 
 parse_arguments() {
   # We only need to pass arguments through to the server if we don't
@@ -82,8 +97,9 @@
 force=0
 verbose=0
 fill_help_tables=""
+base_version=@MYSQL_BASE_VERSION@
 
-parse_arguments `$print_defaults $defaults mysqld mysql_install_db`
+parse_arguments `$print_defaults $defaults $defaults_group_suffix mysqld mysqld-$base_version mysql_install_db`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
 test -z "$ldata" && ldata=@localstatedir@
@@ -211,7 +227,7 @@
 then
   echo "Installing all prepared tables"
 fi
-mysqld_install_cmd_line="$mysqld $defaults $mysqld_opt --bootstrap \
+mysqld_install_cmd_line="$mysqld $defaults $defaults_group_suffix $mysqld_opt --bootstrap \
 --skip-grant-tables --basedir=$basedir --datadir=$ldata --skip-innodb \
 --skip-bdb --skip-ndbcluster $args --max_allowed_packet=8M --net_buffer_length=16K"
 if $scriptdir/mysql_create_system_tables $create_option $mdata $hostname $windows \