mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge mysql.com:/home/tnurnberg/15327/50-15327
into mysql.com:/home/tnurnberg/15327/51-15327 BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555: Auto merged BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6: Auto merged client/mysql_upgrade.c: Auto merged configure.in: Auto merged libmysql/libmysql.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run-shell.sh: Auto merged netware/mysql_test_run.c: Auto merged scripts/Makefile.am: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged server-tools/instance-manager/priv.h: Auto merged client/mysql.cc: manual merge client/mysqladmin.cc: manual merge client/mysqlbinlog.cc: manual merge client/mysqlcheck.c: manual merge client/mysqldump.c: manual merge client/mysqlimport.c: manual merge client/mysqlshow.c: manual merge client/mysqltest.c: manual merge sql/mysqld.cc: manual merge tests/mysql_client_test.c: manual merge tests/thread_test.c: manual merge
This commit is contained in:
@ -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 */
|
||||
|
Reference in New Issue
Block a user