diff options
| author | unknown <paul@snake-hub.snake.net> | 2006-02-28 14:05:20 -0600 |
|---|---|---|
| committer | unknown <paul@snake-hub.snake.net> | 2006-02-28 14:05:20 -0600 |
| commit | f6d7a36a053ce94f15441232f94b06fc22f2ec51 (patch) | |
| tree | b1c67d9096bf300d6cb3dd1aa88272a443b21ad3 /client/mysqltest.c | |
| parent | 604d48206f295590f2e8609f3ec9f6aba73ec602 (diff) | |
| parent | 046530d5bc1a91131bbebaaab043486d5cb03988 (diff) | |
| download | mariadb-git-f6d7a36a053ce94f15441232f94b06fc22f2ec51.tar.gz | |
Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
client/mysqltest.c:
Auto merged
Diffstat (limited to 'client/mysqltest.c')
| -rw-r--r-- | client/mysqltest.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index ab61c6f5513..e86b607a1e0 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -380,13 +380,6 @@ const char *command_names[]= "connection", "query", "connect", - /* the difference between sleep and real_sleep is that sleep will use - the delay from command line (--sleep) if there is one. - real_sleep always uses delay from mysqltest's command line argument. - the logic is that sometimes delays are cpu-dependent (and --sleep - can be used to set this delay. real_sleep is used for cpu-independent - delays - */ "sleep", "real_sleep", "inc", @@ -1781,11 +1774,19 @@ int do_disable_rpl_parse(struct st_query *query __attribute__((unused))) do_sleep() q called command real_sleep use the value from opt_sleep as number of seconds to sleep + if real_sleep is false DESCRIPTION sleep <seconds> - real_sleep - + real_sleep <seconds> + + The difference between the sleep and real_sleep commands is that sleep + uses the delay from the --sleep command-line option if there is one. + (If the --sleep option is not given, the sleep command uses the delay + specified by its argument.) The real_sleep command always uses the + delay specified by its argument. The logic is that sometimes delays are + cpu-dependent, and --sleep can be used to set this delay. real_sleep is + used for cpu-independent delays. */ int do_sleep(struct st_query *query, my_bool real_sleep) @@ -4896,7 +4897,7 @@ void get_query_type(struct st_query* q) q->type=(enum enum_commands) type; /* Found command */ /* If queries are disabled, only recognize - --enable-queries and --disable-queries + --enable_parsing and --disable_parsing */ if (parsing_disabled && q->type != Q_ENABLE_PARSING && q->type != Q_DISABLE_PARSING) |