Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
1b44fe61
Commit
1b44fe61
authored
Nov 07, 2006
by
petr/cps@outpost.site
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Bug #22494 Instance Manager: Inconsistent error message wording
Use better wording
parent
103e0d5e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
mysql-test/r/im_life_cycle.result
mysql-test/r/im_life_cycle.result
+2
-2
server-tools/instance-manager/messages.cc
server-tools/instance-manager/messages.cc
+1
-1
No files found.
mysql-test/r/im_life_cycle.result
View file @
1b44fe61
...
@@ -25,7 +25,7 @@ Success: the process has been stopped.
...
@@ -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
...
@@ -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.
...
...
server-tools/instance-manager/messages.cc
View file @
1b44fe61
...
@@ -45,7 +45,7 @@ static const char *mysqld_error_message(unsigned sql_errno)
...
@@ -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."
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment