From 709a5d6a8b5b3dc43d45eec27bda9d3f9bc38b57 Mon Sep 17 00:00:00 2001
From: "ulli@morbus.(none)" <>
Date: Thu, 26 Feb 2004 19:09:49 +0100
Subject: [PATCH] fix for bug #2905 - "mysqladmin.c & co fail to use MYSQL_PORT
 as the default value of the TCP/IP port"

---
 BitKeeper/etc/logging_ok | 1 +
 client/mysqladmin.c      | 2 +-
 client/mysqltest.c       | 2 +-
 client/thread_test.c     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index c51d344aef5..dda23f91e70 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -125,6 +125,7 @@ tonu@hundin.mysql.fi
 tonu@volk.internalnet
 tonu@x153.internalnet
 tonu@x3.internalnet
+ulli@morbus.(none)
 venu@work.mysql.com
 vva@eagle.mysql.r18.ru
 vva@genie.(none)
diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index 09e6bf98f1c..6bd2d3caad1 100644
--- a/client/mysqladmin.c
+++ b/client/mysqladmin.c
@@ -134,7 +134,7 @@ static struct my_option my_long_options[] =
    NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
   {"port", 'P', "Port number to use for connection.", (gptr*) &tcp_port,
-   (gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   (gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0, 0},
   {"relative", 'r',
    "Show difference between current and previous values when used with -i. Currently works only with extended-status.",
    (gptr*) &opt_relative, (gptr*) &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 13f575eaf0a..f41f697ad26 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1879,7 +1879,7 @@ static struct my_option my_long_options[] =
   {"password", 'p', "Password to use when connecting to server.",
    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"port", 'P', "Port number to use for connection.", (gptr*) &port,
-   (gptr*) &port, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   (gptr*) &port, 0, GET_INT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0, 0},
   {"quiet", 's', "Suppress all normal output.", (gptr*) &silent,
    (gptr*) &silent, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"record", 'r', "Record output of test_file into result file.",
diff --git a/client/thread_test.c b/client/thread_test.c
index 2900ab712e2..66ca45bf1cf 100644
--- a/client/thread_test.c
+++ b/client/thread_test.c
@@ -104,7 +104,7 @@ static struct my_option my_long_options[] =
   {"query", 'Q', "Query to execute in each threads", (gptr*) &query,
    (gptr*) &query, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"port", 'P', "Port number to use for connection", (gptr*) &tcp_port,
-   (gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+   (gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0, 0},
   {"socket", 'S', "Socket file to use for connection", (gptr*) &unix_socket,
    (gptr*) &unix_socket, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"test-count", 'c', "Run test count times (default %d)",
-- 
2.30.9