summaryrefslogtreecommitdiff
path: root/client/mysqlcheck.c
diff options
context:
space:
mode:
authortnurnberg@sin.intern.azundris.com <>2007-09-15 04:09:38 +0200
committertnurnberg@sin.intern.azundris.com <>2007-09-15 04:09:38 +0200
commitd5174aad89e82cc0140150144bde581842238c2e (patch)
treee53fd604dfbb3db1190c5c65e2a83a9faa64e25c /client/mysqlcheck.c
parent8e22343c583651a48fe5dbb45711ed960e49b708 (diff)
parent3c6ca8d6edf55764df93a831f61dc3855e82d91c (diff)
downloadmariadb-git-d5174aad89e82cc0140150144bde581842238c2e.tar.gz
Merge mysql.com:/home/tnurnberg/15327/50-15327
into mysql.com:/home/tnurnberg/15327/51-15327
Diffstat (limited to 'client/mysqlcheck.c')
-rw-r--r--client/mysqlcheck.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 372dfe860df..46d2d2c6775 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -137,7 +137,13 @@ static struct my_option my_long_options[] =
{"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,
NO_ARG, 0, 0, 0, 0, 0, 0},
#endif
- {"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},
{"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).",