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 /scripts/mysql_config.sh | |
| 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 'scripts/mysql_config.sh')
| -rw-r--r-- | scripts/mysql_config.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index f094cb060b7..ab58c512aac 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -92,9 +92,14 @@ fix_path pkgincludedir include/mysql include version='@VERSION@' socket='@MYSQL_UNIX_ADDR@' -port='@MYSQL_TCP_PORT@' ldflags='@LDFLAGS@' +if [ @MYSQL_TCP_PORT_DEFAULT@ -eq 0 ]; then + port=0 +else + port=@MYSQL_TCP_PORT@ +fi + # Create options # We intentionally add a space to the beginning and end of lib strings, simplifies replace later libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" |