diff options
| author | unknown <tsmith@sita.local> | 2007-09-24 11:33:27 +0200 |
|---|---|---|
| committer | unknown <tsmith@sita.local> | 2007-09-24 11:33:27 +0200 |
| commit | 139b563ec40f21387de56d2848934a1d684fbe7f (patch) | |
| tree | 766c9579cf8ea7c94942af2e5f5929d563f313ea /server-tools/instance-manager/priv.h | |
| parent | ad57f91294e80016af10f282202fa5abb788bdc9 (diff) | |
| parent | cfbb6fc63255dadb92af18546fa7ebe8d91aa870 (diff) | |
| download | mariadb-git-139b563ec40f21387de56d2848934a1d684fbe7f.tar.gz | |
Merge sita.local:/Users/tsmith/m/bk/50
into sita.local:/Users/tsmith/m/bk/maint/50
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'server-tools/instance-manager/priv.h')
| -rw-r--r-- | server-tools/instance-manager/priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |