From 3c6ca8d6edf55764df93a831f61dc3855e82d91c Mon Sep 17 00:00:00 2001
From: "tnurnberg@mysql.com/sin.intern.azundris.com" <>
Date: Thu, 13 Sep 2007 16:19:46 +0200
Subject: 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)
---
 server-tools/instance-manager/priv.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server-tools')

diff --git a/server-tools/instance-manager/priv.h b/server-tools/instance-manager/priv.h
index a746288f28b..2e55e0ac8e6 100644
--- a/server-tools/instance-manager/priv.h
+++ b/server-tools/instance-manager/priv.h
@@ -25,7 +25,7 @@
 #include "my_pthread.h"
 
 /* IM-wide platform-independent defines */
-#define SERVER_DEFAULT_PORT 3306
+#define SERVER_DEFAULT_PORT MYSQL_PORT
 #define DEFAULT_MONITORING_INTERVAL 20
 #define DEFAULT_PORT 2273
 /* three-week timeout should be enough */
-- 
cgit v1.2.1