diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 04:09:38 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 04:09:38 +0200 |
| commit | 682c22846fe5aaf35762a21daf2ba29162b1fc4c (patch) | |
| tree | e53fd604dfbb3db1190c5c65e2a83a9faa64e25c /client/mysqlbinlog.cc | |
| parent | 866225919c303f36e83b6af10e3908bcb39bda62 (diff) | |
| parent | ee7f125d5f42fd653cb09cf5b15ae9384b7d9248 (diff) | |
| download | mariadb-git-682c22846fe5aaf35762a21daf2ba29162b1fc4c.tar.gz | |
Merge mysql.com:/home/tnurnberg/15327/50-15327
into mysql.com:/home/tnurnberg/15327/51-15327
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
Auto merged
BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6:
Auto merged
client/mysql_upgrade.c:
Auto merged
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
netware/mysql_test_run.c:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
server-tools/instance-manager/priv.h:
Auto merged
client/mysql.cc:
manual merge
client/mysqladmin.cc:
manual merge
client/mysqlbinlog.cc:
manual merge
client/mysqlcheck.c:
manual merge
client/mysqldump.c:
manual merge
client/mysqlimport.c:
manual merge
client/mysqlshow.c:
manual merge
client/mysqltest.c:
manual merge
sql/mysqld.cc:
manual merge
tests/mysql_client_test.c:
manual merge
tests/thread_test.c:
manual merge
Diffstat (limited to 'client/mysqlbinlog.cc')
| -rw-r--r-- | client/mysqlbinlog.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index edade347783..f848a98e5a6 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -754,8 +754,14 @@ static struct my_option my_long_options[] = 0, GET_ULL, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"password", 'p', "Password to connect to remote server.", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, - {"port", 'P', "Use port to connect to the remote server.", - (uchar**) &port, (uchar**) &port, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, + {"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**) &port, (uchar**) &port, 0, GET_INT, REQUIRED_ARG, + 0, 0, 0, 0, 0, 0}, 0, 0, 0}, {"position", 'j', "Deprecated. Use --start-position instead.", (uchar**) &start_position, (uchar**) &start_position, 0, GET_ULL, |