1 From: Ignacio GalarzaDate: December 14 2006 10:41pm
2 Subject: bk commit into 5.0 tree (iggy:1.2355) BUG#18156
4 Below is the list of changes that have just been committed into a local
5 5.0 repository of iggy. When iggy does a push these changes will
6 be propagated to the main repository and, within 24 hours after the
7 push, to the public repository.
8 For information on how to access the public repository
9 see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
11 ChangeSet@stripped, 2006-12-14 16:41:24-05:00, iggy@alf. +1 -0
12 Bug#18156 mysql_upgrade does not pass basedir or password arg to mysql and mysqlcheck
13 - mysql_upgrade improperly reads the password and protocol options from command line.
15 client/mysql_upgrade.c@stripped, 2006-12-14 16:40:41-05:00, iggy@alf. +5 -3
16 Bug#18156 mysql_upgrade does not pass basedir or password arg to mysql and mysqlcheck
17 - The password and protocol options were not being associate with their variables
20 # This is a BitKeeper patch. What follows are the unified diffs for the
21 # set of deltas contained in the patch. The rest of the patch, the part
22 # that BitKeeper cares about, is below these diffs.
25 # Root: D:/src/mysql-5.0-maint_18156
27 --- 1.14/client/mysql_upgrade.c 2006-12-14 16:41:35 -05:00
28 +++ 1.15/client/mysql_upgrade.c 2006-12-14 16:41:35 -05:00
30 (gptr*) ¤t_host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
32 "Password to use when connecting to server. If password is not given"
33 - " it's solicited on the tty.", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
34 + " it's solicited on the tty.", (gptr*) &opt_password, (gptr*) &opt_password,
35 + 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
37 {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0,
38 GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
40 {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
41 (gptr*) &opt_mysql_port, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
42 {"protocol", OPT_MYSQL_PROTOCOL,
43 - "The protocol of connection (tcp,socket,pipe,memory).",
44 - 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
45 + "The protocol of connection (tcp,socket,pipe,memory).",
46 + (gptr*) &opt_protocol, (gptr*) &opt_protocol, 0, GET_STR, REQUIRED_ARG, 0,
49 {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
50 "Base name of shared memory.", (gptr*) &shared_memory_base_name,