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 /tests/thread_test.c | |
| 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 'tests/thread_test.c')
| -rw-r--r-- | tests/thread_test.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/thread_test.c b/tests/thread_test.c index b3a34447271..8e1c58ebbec 100644 --- a/tests/thread_test.c +++ b/tests/thread_test.c @@ -103,7 +103,13 @@ static struct my_option my_long_options[] = (uchar**) &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"query", 'Q', "Query to execute in each threads", (uchar**) &query, (uchar**) &query, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, - {"port", 'P', "Port number to use for connection", (uchar**) &tcp_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**) &tcp_port, (uchar**) &tcp_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0, 0}, {"socket", 'S', "Socket file to use for connection", (uchar**) &unix_socket, (uchar**) &unix_socket, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, |