Commit 3c6ca8d6 authored by tnurnberg@mysql.com/sin.intern.azundris.com's avatar tnurnberg@mysql.com/sin.intern.azundris.com
Browse files

Bug #15327: configure: --with-tcp-port option being partially ignored 

make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
parent 4a52b5c8

client/mysql.cc

+8 −3
Original line number Diff line number Diff line
@@ -673,9 +673,14 @@ 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.", (gptr*) &opt_mysql_port,

   (gptr*) &opt_mysql_port, 0, GET_UINT, REQUIRED_ARG, 0, 0, 0, 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) ").",

   (gptr*) &opt_mysql_port,

   (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,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

client/mysql_upgrade.c

+7 −2
Original line number Diff line number Diff line
@@ -88,8 +88,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.", 0,

   0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 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) ").",

   0, 0, 0, GET_STR, 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},

client/mysqladmin.cc

+7 −1
Original line number Diff line number Diff line
@@ -159,7 +159,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.", (gptr*) &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) ").",

   (gptr*) &tcp_port,

   (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},

client/mysqlbinlog.cc

+8 −3
Original line number Diff line number Diff line
@@ -687,9 +687,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.",

   (gptr*) &port, (gptr*) &port, 0, GET_INT, REQUIRED_ARG, 0, 0, 0,

   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) ").",

   (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,

   REQUIRED_ARG, BIN_LOG_HEADER_SIZE, BIN_LOG_HEADER_SIZE,

client/mysqlcheck.c

+7 −1
Original line number Diff line number Diff line
@@ -123,7 +123,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.", (gptr*) &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) ").",

   (gptr*) &opt_mysql_port,

   (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).",