summaryrefslogtreecommitdiff
path: root/client/mysqlshow.c
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-11-28 10:52:52 -0800
committerjimw@mysql.com <>2005-11-28 10:52:52 -0800
commit5f7e5b46c6045d3a3f24a2bb56050878f19c9788 (patch)
treeabc87ff21331c01b2982869378829ca175075bb5 /client/mysqlshow.c
parent9df4951acbdb32f3c1fab8deeaa2d0789cd1257e (diff)
parentb6dcc55969a759a8c209d53a01811f460b5fd23a (diff)
downloadmariadb-git-5f7e5b46c6045d3a3f24a2bb56050878f19c9788.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-5792
into mysql.com:/home/jimw/my/mysql-5.0-clean
Diffstat (limited to 'client/mysqlshow.c')
-rw-r--r--client/mysqlshow.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 8369d918d6f..504f0d9844b 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -188,7 +188,7 @@ static struct my_option my_long_options[] =
"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.", (gptr*) &opt_mysql_port,
- (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
+ (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
0},
#ifdef __WIN__
{"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,