summaryrefslogtreecommitdiff
path: root/client/mysqltest.c
diff options
context:
space:
mode:
authorpaul@snake-hub.snake.net <>2006-03-03 14:37:43 -0600
committerpaul@snake-hub.snake.net <>2006-03-03 14:37:43 -0600
commit1442be9798ae042f97e3cba60a3323b2c3577118 (patch)
tree17f847602afbf474ddf24c395713fae29e2a6b25 /client/mysqltest.c
parentf3cf52832d6f9e6b4ad472ad81ed85345c74e48c (diff)
parentf3c7e2d3ed9335126789ecb54f7f586e7bf24199 (diff)
downloadmariadb-git-1442be9798ae042f97e3cba60a3323b2c3577118.tar.gz
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
Diffstat (limited to 'client/mysqltest.c')
-rw-r--r--client/mysqltest.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 0dd8892bfd1..a0c75511dc9 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1647,19 +1647,20 @@ int do_sleep(struct st_query *query, my_bool real_sleep)
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)