diff options
| author | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-18 19:21:07 -0600 |
|---|---|---|
| committer | unknown <malff@lambda.hsd1.co.comcast.net.> | 2007-10-18 19:21:07 -0600 |
| commit | 244fb387a37c5075e9a2502f91695eab6a6f852c (patch) | |
| tree | 8c58cce3d12a266f24fca742ef14f9bbe8f047be /client/mysqlimport.c | |
| parent | 6f2d5b301bcbfcb96527a0e089e52b7ace4ad470 (diff) | |
| parent | bf5bcb849f56735ffb5270772106ad252bc05cc6 (diff) | |
| download | mariadb-git-244fb387a37c5075e9a2502f91695eab6a6f852c.tar.gz | |
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
client/mysqltest.c:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/udf.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/udf_example.c:
Auto merged
sql/udf_example.def:
Auto merged
Diffstat (limited to 'client/mysqlimport.c')
| -rw-r--r-- | client/mysqlimport.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index afd9454d6be..954af0cff97 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.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).", |