database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix Bug #22494 Instance Manager: Inconsistent error message wording

Browse Source 
Use better wording


mysql-test/r/im_life_cycle.result:
  update result file with new error message
server-tools/instance-manager/messages.cc:
  use better error message (as adviced by paul)
This commit is contained in:
unknown
2006-11-07 05:21:33 +03:00
parent da032b99eb
commit b63b7ad3d0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/im_life_cycle.result
View File

@ -25,7 +25,7 @@ Success: the process has been stopped.
-- 1.1.4. -- 1.1.4.
-------------------------------------------------------------------- --------------------------------------------------------------------
START INSTANCE mysqld3; START INSTANCE mysqld3;
ERROR HY000: Bad instance name. Check that the instance with such a name exists ERROR HY000: Unknown instance name
START INSTANCE mysqld1; START INSTANCE mysqld1;
ERROR HY000: The instance is already started ERROR HY000: The instance is already started
@ -33,7 +33,7 @@ ERROR HY000: The instance is already started
-- 1.1.5. -- 1.1.5.
-------------------------------------------------------------------- --------------------------------------------------------------------
STOP INSTANCE mysqld3; STOP INSTANCE mysqld3;
ERROR HY000: Bad instance name. Check that the instance with such a name exists ERROR HY000: Unknown instance name
-------------------------------------------------------------------- --------------------------------------------------------------------
-- 1.1.6. -- 1.1.6.

2
server-tools/instance-manager/messages.cc
View File

@ -45,7 +45,7 @@ static const char *mysqld_error_message(unsigned sql_errno)
" corresponds to your MySQL Instance Manager version for the right" " corresponds to your MySQL Instance Manager version for the right"
" syntax to use"; " syntax to use";
case ER_BAD_INSTANCE_NAME: case ER_BAD_INSTANCE_NAME:
return "Bad instance name. Check that the instance with such a name exists"; return "Unknown instance name";
case ER_INSTANCE_IS_NOT_STARTED: case ER_INSTANCE_IS_NOT_STARTED:
return "Cannot stop instance. Perhaps the instance is not started, or was" return "Cannot stop instance. Perhaps the instance is not started, or was"
" started manually, so IM cannot find the pidfile."; " started manually, so IM cannot find the pidfile.";