bk commit into 5.0 tree (paul:1.2098)

[paul]

Below is the list of changes that have just been committed into a local
5.0 repository of paul. When paul 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.2098 06/03/03 14:37:43 paul@stripped +1 -0
  Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-4.1-clone
  into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0-clone

  client/mysqltest.c
    1.217 06/03/03 14:37:38 paul@stripped +0 -0
    Auto merged

# 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:	paul
# Host:	snake-hub.snake.net
# Root:	/src/extern/MySQL/bk/mysql-5.0-clone/RESYNC

--- 1.216/client/mysqltest.c	2006-03-03 14:34:08 -06:00
+++ 1.217/client/mysqltest.c	2006-03-03 14:37:38 -06:00
@@ -1647,19 +1647,20 @@
   char *p= query->first_argument;
   char *sleep_start, *sleep_end= query->end;
   double sleep_val;
-  char *cmd = (real_sleep ? "real_sleep" : "sleep");
 
   while (my_isspace(charset_info, *p))
     p++;
   if (!*p)
-    die("Missing argument to %s", cmd);
+    die("Missing argument to %.*s", query->first_word_len, query->query);
   sleep_start= p;
   /* Check that arg starts with a digit, not handled by my_strtod */
   if (!my_isdigit(charset_info, *sleep_start))
-    die("Invalid argument to %s \"%s\"", cmd, query->first_argument);
+    die("Invalid argument to %.*s \"%s\"", query->first_word_len, query->query,
+		query->first_argument);
   sleep_val= my_strtod(sleep_start, &sleep_end, &error);
   if (error)
-    die("Invalid argument to %s \"%s\"", cmd, query->first_argument);
+    die("Invalid argument to %.*s \"%s\"", query->first_word_len, query->query,
+		query->first_argument);
 
   /* Fixed sleep time selected by --sleep option */
   if (opt_sleep && !real_sleep)