bk commit into 4.1 tree (igreenhoe:1.2537) BUG#17979

[Ian Greenhoe]

Below is the list of changes that have just been committed into a local
4.1 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:14:53-07:00, igreenhoe@stripped +1 -0
  Fix for bug #17979 (my_print_defaults/mysql_install_db ignore
  [mysqld-X.Y] sections in option files)
  
  Problem: As stated.
  
  Solution: Modify scripts/mysql_install_db.sh
  Patch is for 4.1 since problem exists in that version as well.

  scripts/mysql_install_db.sh@stripped, 2006-08-07 15:14:50-07:00, igreenhoe@stripped +2 -1
    Added mysql-VERSION to the list of checked groups.

# 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-4.1-17979

--- 1.74/scripts/mysql_install_db.sh	2006-08-07 15:14:57 -07:00
+++ 1.75/scripts/mysql_install_db.sh	2006-08-07 15:14:57 -07:00
@@ -81,8 +81,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 mysqld mysqld-$base_version mysql_install_db`
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
 test -z "$ldata" && ldata=@localstatedir@