mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
a bunch of IM fixes from the GUI team
mysql-test/r/im_life_cycle.result: correct result mysql-test/t/im_life_cycle.imtest: check that wrong command is processed correctly server-tools/instance-manager/Makefile.am: always look for passwords in /etc/ on unixes server-tools/instance-manager/commands.cc: fix warning server-tools/instance-manager/instance.cc: fix monitoring capabilities, when no port was specified for an instance server-tools/instance-manager/instance_map.cc: allow relative paths in --defaults-file option server-tools/instance-manager/mysqlmanager.cc: fix windows warning server-tools/instance-manager/options.cc: add vars to allow relative paths in --defaults-file option server-tools/instance-manager/options.h: add an option server-tools/instance-manager/parse.cc: check for get_text_id return value server-tools/instance-manager/portability.h: add _snprintf define, move platfrom-independent ifdefs to priv.h server-tools/instance-manager/priv.cc: increase net timeout. it should be equal to mysqld's server-tools/instance-manager/priv.h: move platform-independent ifdefs here
This commit is contained in:
@@ -24,6 +24,11 @@
|
||||
#endif
|
||||
#include "my_pthread.h"
|
||||
|
||||
/* IM-wide platform-independent defines */
|
||||
#define SERVER_DEFAULT_PORT 3306
|
||||
#define DEFAULT_MONITORING_INTERVAL 20
|
||||
#define DEFAULT_PORT 2273
|
||||
|
||||
/* the pid of the manager process (of the signal thread on the LinuxThreads) */
|
||||
extern pid_t manager_pid;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user