summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorpaul@snake-hub.snake.net <>2006-02-28 15:08:16 -0600
committerpaul@snake-hub.snake.net <>2006-02-28 15:08:16 -0600
commitd6654fe9cbcb438c91b7d69b9197d61f8d31dc54 (patch)
treec1412a962b0113cc54462ffee0ec31d7da2cf2fc /client
parentfc8ed82da4ed31e24647cd41fc77dcc112fd811a (diff)
downloadmariadb-git-d6654fe9cbcb438c91b7d69b9197d61f8d31dc54.tar.gz
mysql-test-run.sh:
Fix URLs. README: Fix URL. mysqltest.result: Update test result for real_sleep error message. mysqltest.c: Fix do_sleep() to print correct command name for real_sleep.
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 83be283a050..a525adfd819 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -1550,18 +1550,19 @@ 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 sleep");
+ die("Missing argument to %s", cmd);
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 sleep \"%s\"", query->first_argument);
+ die("Invalid argument to %s \"%s\"", cmd, query->first_argument);
sleep_val= my_strtod(sleep_start, &sleep_end, &error);
if (error)
- die("Invalid argument to sleep \"%s\"", query->first_argument);
+ die("Invalid argument to %s \"%s\"", cmd, query->first_argument);
/* Fixed sleep time selected by --sleep option */
if (opt_sleep && !real_sleep)