Hi!
On Sep 13, Tatjana A Nuernberg wrote:
> ChangeSet@stripped, 2007-09-13 16:19:46+02:00, tnurnberg@stripped +26 -0
> 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)
Thanks!
Ok to push.
> diff -Nrup a/client/mysql.cc b/client/mysql.cc
> --- a/client/mysql.cc 2007-04-23 16:21:59 +02:00
> +++ b/client/mysql.cc 2007-09-13 16:19:43 +02:00
> @@ -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) ").",
I hope you verified that it works as expected :)
When suggesting I forgot to add a usual disclaimer *untested* ;-p
Regards / Mit vielen Grüssen,
Sergei
--
__ ___ ___ ____ __
/ |/ /_ __/ __/ __ \/ / Sergei Golubchik <serg@stripped>
/ /|_/ / // /\ \/ /_/ / /__ Principal Software Developer
/_/ /_/\_, /___/\___\_\___/ MySQL GmbH, Dachauer Str. 37, D-80335 München
<___/ Geschäftsführer: Kaj Arnö - HRB
München 162140
