diff options
| author | tnurnberg@mysql.com/sin.intern.azundris.com <> | 2007-09-13 16:19:46 +0200 |
|---|---|---|
| committer | tnurnberg@mysql.com/sin.intern.azundris.com <> | 2007-09-13 16:19:46 +0200 |
| commit | 3c6ca8d6edf55764df93a831f61dc3855e82d91c (patch) | |
| tree | 602e3e9d9862d8866b20f7d497d64c91d470ea4e /include/mysql_version.h.in | |
| parent | 4a52b5c88547a01f33b2566d4503f6eef7f082bc (diff) | |
| download | mariadb-git-3c6ca8d6edf55764df93a831f61dc3855e82d91c.tar.gz | |
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)
Diffstat (limited to 'include/mysql_version.h.in')
| -rw-r--r-- | include/mysql_version.h.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mysql_version.h.in b/include/mysql_version.h.in index dac7ca661d1..04a43f2c968 100644 --- a/include/mysql_version.h.in +++ b/include/mysql_version.h.in @@ -15,6 +15,7 @@ #define FRM_VER @DOT_FRM_VERSION@ #define MYSQL_VERSION_ID @MYSQL_VERSION_ID@ #define MYSQL_PORT @MYSQL_TCP_PORT@ +#define MYSQL_PORT_DEFAULT @MYSQL_TCP_PORT_DEFAULT@ #define MYSQL_UNIX_ADDR "@MYSQL_UNIX_ADDR@" #define MYSQL_CONFIG_NAME "my" #define MYSQL_COMPILATION_COMMENT "@COMPILATION_COMMENT@" |