MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Petr Chardin Date:November 7 2006 2:21am
Subject:bk commit into 5.1 tree (petr:1.2341) BUG#22494
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-07 05:21:33+03:00, petr@stripped +2 -0
  Fix Bug #22494 Instance Manager: Inconsistent error message wording
  Use better wording

  mysql-test/r/im_life_cycle.result@stripped, 2006-11-07 05:21:30+03:00, petr@stripped +2 -2
    update result file with new error message

  server-tools/instance-manager/messages.cc@stripped, 2006-11-07 05:21:30+03:00, petr@stripped +1 -1
    use better error message (as adviced by paul)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	petr
# Host:	outpost.site
# Root:	/home/cps/mysql/trees/mysql-5.1-runtime

--- 1.15/mysql-test/r/im_life_cycle.result	2006-09-05 21:36:33 +04:00
+++ 1.16/mysql-test/r/im_life_cycle.result	2006-11-07 05:21:30 +03:00
@@ -25,7 +25,7 @@
 -- 1.1.4.
 --------------------------------------------------------------------
 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;
 ERROR HY000: The instance is already started
 
@@ -33,7 +33,7 @@
 -- 1.1.5.
 --------------------------------------------------------------------
 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.7/server-tools/instance-manager/messages.cc	2006-08-17 19:16:19 +04:00
+++ 1.8/server-tools/instance-manager/messages.cc	2006-11-07 05:21:30 +03:00
@@ -45,7 +45,7 @@
            " corresponds to your MySQL Instance Manager version for the right"
            " syntax to use";
   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:
     return "Cannot stop instance. Perhaps the instance is not started, or was"
            " started manually, so IM cannot find the pidfile.";
Thread
bk commit into 5.1 tree (petr:1.2341) BUG#22494Petr Chardin7 Nov