MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:Jim Winstead Date:October 13 2005 7:28pm
Subject:bk commit into 4.1 tree (jimw:1.2479) BUG#5792
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2479 05/10/13 12:28:43 jimw@stripped +8 -0
  Fix being able to set default TCP port for command-line utilities
  by using MYSQL_TCP_PORT variable. (Bug #5792)

  client/mysqltest.c
    1.189 05/10/13 12:28:40 jimw@stripped +1 -1
    Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().

  client/mysqlshow.c
    1.40 05/10/13 12:28:40 jimw@stripped +1 -1
    Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().

  client/mysqlimport.c
    1.52 05/10/13 12:28:40 jimw@stripped +1 -1
    Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().

  client/mysqldump.c
    1.197 05/10/13 12:28:40 jimw@stripped +1 -1
    Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().

  client/mysqlcheck.c
    1.49 05/10/13 12:28:40 jimw@stripped +1 -1
    Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().

  client/mysqlbinlog.cc
    1.107 05/10/13 12:28:40 jimw@stripped +2 -2
    Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().

  client/mysqladmin.cc
    1.107 05/10/13 12:28:40 jimw@stripped +1 -1
    Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().

  client/mysql.cc
    1.215 05/10/13 12:28:39 jimw@stripped +1 -1
    Set default port to 0 so MYSQL_TCP_PORT is handled by mysql_server_init().

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-5792

--- 1.214/client/mysql.cc	2005-10-06 06:42:45 -07:00
+++ 1.215/client/mysql.cc	2005-10-13 12:28:39 -07:00
@@ -610,7 +610,7 @@
    NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
   {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
-   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
+   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
    0},
   {"prompt", OPT_PROMPT, "Set the mysql prompt to this value.",
    (gptr*) &current_prompt, (gptr*) &current_prompt, 0, GET_STR_ALLOC,

--- 1.106/client/mysqladmin.cc	2005-08-25 02:08:20 -07:00
+++ 1.107/client/mysqladmin.cc	2005-10-13 12:28:40 -07:00
@@ -161,7 +161,7 @@
    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, MYSQL_PORT, 0, 0, 0, 0, 0},
+   (gptr*) &tcp_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"protocol", OPT_MYSQL_PROTOCOL, "The protocol of connection (tcp,socket,pipe,memory).",
     0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"relative", 'r',

--- 1.196/client/mysqldump.c	2005-08-25 02:08:20 -07:00
+++ 1.197/client/mysqldump.c	2005-10-13 12:28:40 -07:00
@@ -322,7 +322,7 @@
    NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
   {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
-   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
+   (gptr*) &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).",
    0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

--- 1.51/client/mysqlimport.c	2005-09-07 15:49:57 -07:00
+++ 1.52/client/mysqlimport.c	2005-10-13 12:28:40 -07:00
@@ -121,7 +121,7 @@
    NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
   {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
-   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
+   (gptr*) &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).",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

--- 1.39/client/mysqlshow.c	2005-08-25 02:08:20 -07:00
+++ 1.40/client/mysqlshow.c	2005-10-13 12:28:40 -07:00
@@ -183,7 +183,7 @@
    "Password to use when connecting to server. If password is not given it's asked from the tty.",
    0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
   {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
-   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
+   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0,
    0},
 #ifdef __WIN__
   {"pipe", 'W', "Use named pipes to connect to server.", 0, 0, 0, GET_NO_ARG,

--- 1.106/client/mysqlbinlog.cc	2005-08-25 02:08:20 -07:00
+++ 1.107/client/mysqlbinlog.cc	2005-10-13 12:28:40 -07:00
@@ -49,7 +49,7 @@
 static my_bool force_opt= 0, short_form= 0, remote_opt= 0;
 static ulonglong offset = 0;
 static const char* host = 0;
-static int port = MYSQL_PORT;
+static int port= 0;
 static const char* sock= 0;
 static const char* user = 0;
 static char* pass = 0;
@@ -462,7 +462,7 @@
   {"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.",
-   (gptr*) &port, (gptr*) &port, 0, GET_INT, REQUIRED_ARG, MYSQL_PORT, 0, 0,
+   (gptr*) &port, (gptr*) &port, 0, GET_INT, REQUIRED_ARG, 0, 0, 0,
    0, 0, 0},
   {"position", 'j', "Deprecated. Use --start-position instead.",
    (gptr*) &start_position, (gptr*) &start_position, 0, GET_ULL,

--- 1.48/client/mysqlcheck.c	2005-08-24 12:06:21 -07:00
+++ 1.49/client/mysqlcheck.c	2005-10-13 12:28:40 -07:00
@@ -122,7 +122,7 @@
    NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
   {"port", 'P', "Port number to use for connection.", (gptr*) &opt_mysql_port,
-   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, MYSQL_PORT, 0, 0, 0, 0,
+   (gptr*) &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).",
    0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

--- 1.188/client/mysqltest.c	2005-10-05 03:21:50 -07:00
+++ 1.189/client/mysqltest.c	2005-10-13 12:28:40 -07:00
@@ -2474,7 +2474,7 @@
   {"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, MYSQL_PORT, 0, 0, 0, 0, 0},
+   (gptr*) &port, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"ps-protocol", OPT_PS_PROTOCOL, "Use prepared statements protocol for communication",
    (gptr*) &ps_protocol, (gptr*) &ps_protocol, 0,
    GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
Thread
bk commit into 4.1 tree (jimw:1.2479) BUG#5792Jim Winstead13 Oct