bk commit into 5.0 tree (msvensson:1.2070)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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
  1.2070 06/03/07 07:50:04 msvensson@neptunus.(none) +2 -0
  Improve error message for faulty usage of "inc" and "dec"

  mysql-test/r/mysqltest.result
    1.33 06/03/07 07:50:00 msvensson@neptunus.(none) +4 -4
    Update test result

  client/mysqltest.c
    1.225 06/03/07 07:50:00 msvensson@neptunus.(none) +3 -3
    Improve error messages for "inc" and "dec"

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.32/mysql-test/r/mysqltest.result	2006-03-06 22:05:35 +01:00
+++ 1.33/mysql-test/r/mysqltest.result	2006-03-07 07:50:00 +01:00
@@ -305,8 +305,8 @@
 101
 hej
 1
-mysqltest: At line 1: Missing arguments to inc
-mysqltest: At line 1: First argument to inc must be a variable (start with $)
+mysqltest: At line 1: Missing argument to inc
+mysqltest: At line 1: The argument to inc must be a variable (start with $)
 mysqltest: At line 1: End of line junk detected: "1000"
 4
 4
@@ -315,8 +315,8 @@
 99
 hej
 -1
-mysqltest: At line 1: Missing arguments to dec
-mysqltest: At line 1: First argument to dec must be a variable (start with $)
+mysqltest: At line 1: Missing argument to dec
+mysqltest: At line 1: The argument to dec must be a variable (start with $)
 mysqltest: At line 1: End of line junk detected: "1000"
 mysqltest: At line 1: Missing arguments to system, nothing to do!
 mysqltest: At line 1: Missing arguments to system, nothing to do!

--- 1.224/client/mysqltest.c	2006-03-06 22:18:00 +01:00
+++ 1.225/client/mysqltest.c	2006-03-07 07:50:00 +01:00
@@ -1360,9 +1360,9 @@
   const char *p= query->first_argument;
   VAR* v;
   if (!*p)
-    die("Missing arguments to %.*s", query->first_word_len, query->query);
+    die("Missing argument to %.*s", query->first_word_len, query->query);
   if (*p != '$')
-    die("First argument to %.*s must be a variable (start with $)",
+    die("The argument to %.*s must be a variable (start with $)",
         query->first_word_len, query->query);
   v= var_get(p, &p, 1, 0);
   switch (operator) {
@@ -1373,7 +1373,7 @@
     v->int_val++;
     break;
   default:
-    die("Invalid operator to do_operator");
+    die("Invalid operator to do_modify_var");
     break;
   }
   v->int_dirty= 1;