diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-10-10 14:15:09 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-10-10 14:15:09 -0600 |
| commit | 17c19299afd94a4f97f2cad0dd71d25299e56206 (patch) | |
| tree | 0c7021abce949f66539e39f9be638cd713ae31b6 /server-tools | |
| parent | 03bef972d3b508013cfcad2de294569ecdf16158 (diff) | |
| parent | 5597f40f7f6edf7eb1f9c8d4b14000e041f68944 (diff) | |
| download | mariadb-git-17c19299afd94a4f97f2cad0dd71d25299e56206.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
configure.in:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_system_tables_data.sql:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/sql_select.cc:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
Diffstat (limited to 'server-tools')
| -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 5bf47e1e234..1c2124c0e77 100644 --- a/server-tools/instance-manager/priv.h +++ b/server-tools/instance-manager/priv.h @@ -29,7 +29,7 @@ #include "portability.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 */ |