diff options
| author | tnurnberg@sin.intern.azundris.com <> | 2007-09-15 04:09:38 +0200 |
|---|---|---|
| committer | tnurnberg@sin.intern.azundris.com <> | 2007-09-15 04:09:38 +0200 |
| commit | d5174aad89e82cc0140150144bde581842238c2e (patch) | |
| tree | e53fd604dfbb3db1190c5c65e2a83a9faa64e25c /client/mysqlimport.c | |
| parent | 8e22343c583651a48fe5dbb45711ed960e49b708 (diff) | |
| parent | 3c6ca8d6edf55764df93a831f61dc3855e82d91c (diff) | |
| download | mariadb-git-d5174aad89e82cc0140150144bde581842238c2e.tar.gz | |
Merge mysql.com:/home/tnurnberg/15327/50-15327
into mysql.com:/home/tnurnberg/15327/51-15327
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 396063731cf..36ea2fc0034 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -133,7 +133,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).", |