diff options
| author | unknown <petr@mysql.com> | 2006-02-10 02:15:55 +0300 |
|---|---|---|
| committer | unknown <petr@mysql.com> | 2006-02-10 02:15:55 +0300 |
| commit | d7ddf0e02f9a2d7515fa0fad3aa4e41eac0f08a2 (patch) | |
| tree | 873eae3039ba877792e7071a79a4eb336c9e5e61 /server-tools/instance-manager/priv.cc | |
| parent | 4e69c153e31f16c2d46e9bd5cacc92b8e92cf00e (diff) | |
| download | mariadb-git-d7ddf0e02f9a2d7515fa0fad3aa4e41eac0f08a2.tar.gz | |
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
Diffstat (limited to 'server-tools/instance-manager/priv.cc')
| -rw-r--r-- | server-tools/instance-manager/priv.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server-tools/instance-manager/priv.cc b/server-tools/instance-manager/priv.cc index e39c12f4ebb..d2d6a3f636c 100644 --- a/server-tools/instance-manager/priv.cc +++ b/server-tools/instance-manager/priv.cc @@ -15,6 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <my_global.h> +#include <mysql_com.h> #include "priv.h" #include "portability.h" @@ -52,7 +53,7 @@ unsigned long net_buffer_length= 16384; unsigned long max_allowed_packet= 16384; -unsigned long net_read_timeout= 30; // same as in mysqld +unsigned long net_read_timeout= NET_WAIT_TIMEOUT; // same as in mysqld unsigned long net_write_timeout= 60; // same as in mysqld |