bk commit into 5.1 tree (igreenhoe:1.2341)

[Ian Greenhoe]

Below is the list of changes that have just been committed into a local
5.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-10-31 17:09:56-08:00, igreenhoe@stripped +1 -0
  Merge anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/myapproved/my50-myapproved
  into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/myapproved/my51-myapproved
  MERGE: 1.1810.2247.2

  scripts/mysql_fix_privilege_tables.sh@stripped, 2006-10-31 17:09:49-08:00, igreenhoe@stripped +0 -0
    Auto merged
    MERGE: 1.35.1.1

# 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/myapproved/my51-myapproved/RESYNC

--- 1.36/scripts/mysql_fix_privilege_tables.sh	2006-10-31 17:10:11 -08:00
+++ 1.37/scripts/mysql_fix_privilege_tables.sh	2006-10-31 17:10:11 -08:00
@@ -119,9 +119,6 @@ then
 fi
 
 cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host"
-if test ! -z "$password" ; then
-  cmd="$cmd --password=$password"
-fi
 if test ! -z "$port"; then
   cmd="$cmd --port=$port"
 fi
@@ -174,11 +171,22 @@ then
   s_echo ""
 fi
 
+run_cmd() {
+  # Password argument is added here to allow for spaces in password.
+  
+  if test ! -z "$password"
+  then
+    cat $sql_file | $cmd --password="$password"
+  else
+    cat $sql_file | $cmd
+  fi
+}
+
 if test $verbose = 0
 then
-  cat $sql_file | $cmd > /dev/null 2>&1
+  run_cmd > /dev/null 2>&1
 else
-  cat $sql_file | $cmd > /dev/null
+  run_cmd > /dev/null
 fi
 if test $? = 0
 then