mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02: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:
parent
4e69c153e3
commit
d7ddf0e02f
13 changed files with 63 additions and 16 deletions
|
|
@ -140,3 +140,12 @@ SHOW INSTANCES;
|
|||
--exec $MYSQL_TEST_DIR/t/kill_n_check.sh $IM_MYSQLD2_PATH_PID killed
|
||||
|
||||
SHOW INSTANCES;
|
||||
|
||||
###########################################################################
|
||||
#
|
||||
# 1.1.8. Check that Instance Manager returns an error on
|
||||
# incomplete SHOW INSTANCE STATUS command.
|
||||
#
|
||||
###########################################################################
|
||||
--error 1149
|
||||
SHOW INSTANCE STATUS;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue