bk commit into 5.1 tree (mtaylor:1.2382)

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor. When mtaylor 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, 2007-01-10 16:00:23-08:00, mtaylor@qualinost.(none) +1 -0
  On 5.1 on Debian/Ubuntu (haven't tested elsewhere) I get segfaults if I run
mysql_upgrade with the password option. Making this change on a huntch fixed the problem.
I'm not convinced this is the _right_ way to do it, though.

  client/mysql_upgrade.c@stripped, 2007-01-10 16:00:21-08:00, mtaylor@qualinost.(none) +1 -1
    On 5.1 on Debian/Ubuntu (haven't tested elsewhere) I get segfaults if I run
mysql_upgrade with the password option. Making this change on a huntch fixed the problem.
I'm not convinced this is the _right_ way to do it, though.

# 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:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql-5.1-maint

--- 1.19/client/mysql_upgrade.c	2007-01-10 16:00:29 -08:00
+++ 1.20/client/mysql_upgrade.c	2007-01-10 16:00:29 -08:00
@@ -90,7 +90,7 @@
    (gptr*) &current_host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"password", 'p',
    "Password to use when connecting to server. If password is not given"
-   " it's solicited on the tty.", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+   " it's solicited on the tty.", (gptr*) &opt_password, (gptr*) &opt_password, 
0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef __WIN__
   {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, 
    GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},