diff options
| author | tnurnberg@sin.intern.azundris.com <> | 2007-09-15 05:12:02 +0200 |
|---|---|---|
| committer | tnurnberg@sin.intern.azundris.com <> | 2007-09-15 05:12:02 +0200 |
| commit | f3b1822c7a086b18e1456e9e3bd19d7a9eae710c (patch) | |
| tree | dac824d5a046aa0ae331c72bd20721e861592563 /client/mysqlshow.c | |
| parent | f26d69e01a6ffbae92c202c800981e1b102e0eda (diff) | |
| parent | cc3f0af2e199487c8b2cebd6c7b525168ad5a7a7 (diff) | |
| download | mariadb-git-f3b1822c7a086b18e1456e9e3bd19d7a9eae710c.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/tnurnberg/15327/51-15327
Diffstat (limited to 'client/mysqlshow.c')
| -rw-r--r-- | client/mysqlshow.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/client/mysqlshow.c b/client/mysqlshow.c index a7f6cadf450..a43adb0d586 100644 --- a/client/mysqlshow.c +++ b/client/mysqlshow.c @@ -196,7 +196,13 @@ static struct my_option my_long_options[] = {"password", 'p', "Password to use when connecting to server. If password is not given it's asked from the tty.", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, - {"port", 'P', "Port number to use for connection.", (uchar**) &opt_mysql_port, + {"port", 'P', "Port number to use for connection or 0 for default to, in " + "order of preference, my.cnf, $MYSQL_TCP_PORT, " +#if MYSQL_PORT_DEFAULT == 0 + "/etc/services, " +#endif + "built-in default (" STRINGIFY_ARG(MYSQL_PORT) ").", + (uchar**) &opt_mysql_port, (uchar**) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #ifdef __WIN__ |