diff options
| author | monty@mishka.local <> | 2004-09-28 20:19:03 +0300 |
|---|---|---|
| committer | monty@mishka.local <> | 2004-09-28 20:19:03 +0300 |
| commit | 1fc7e6af85e848813315f8693a660f9783cc11d3 (patch) | |
| tree | 357b54a3c96e6af7fe84b214b8435da2979d65a1 /client | |
| parent | 3bddaaf80f7e521f07a17b77d87397165d8b3f5d (diff) | |
| parent | f2941380c4e69f55abc0f09c2e0091ea0cdf3c00 (diff) | |
| download | mariadb-git-1fc7e6af85e848813315f8693a660f9783cc11d3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.local:/home/my/mysql-5.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 3287c9738d3..02982e8e37f 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -229,11 +229,11 @@ Q_ENABLE_INFO, Q_DISABLE_INFO, Q_ENABLE_METADATA, Q_DISABLE_METADATA, Q_EXEC, Q_DELIMITER, Q_DISPLAY_VERTICAL_RESULTS, Q_DISPLAY_HORIZONTAL_RESULTS, -Q_QUERY_VERTICAL, Q_QUERY_HORIZONTAL, +Q_QUERY_VERTICAL, Q_QUERY_HORIZONTAL, Q_EXIT, Q_UNKNOWN, /* Unknown command. */ Q_COMMENT, /* Comments, ignored. */ -Q_COMMENT_WITH_COMMAND +Q_COMMENT_WITH_COMMAND, }; /* this should really be called command */ @@ -308,6 +308,7 @@ const char *command_names[]= "horizontal_results", "query_vertical", "query_horizontal", + "exit", 0 }; @@ -2592,12 +2593,11 @@ int main(int argc, char **argv) { int error = 0; struct st_query *q; - my_bool require_file=0, q_send_flag=0; + my_bool require_file=0, q_send_flag=0, abort_flag= 0; char save_file[FN_REFLEN]; MY_INIT(argv[0]); { DBUG_ENTER("main"); - DBUG_PROCESS(argv[0]); save_file[0]=0; TMPDIR[0]=0; @@ -2653,7 +2653,7 @@ int main(int argc, char **argv) init_var_hash(&cur_con->mysql); - while (!read_query(&q)) + while (!abort_flag && !read_query(&q)) { int current_line_inc = 1, processed = 0; if (q->type == Q_UNKNOWN || q->type == Q_COMMENT_WITH_COMMAND) @@ -2813,6 +2813,9 @@ int main(int argc, char **argv) case Q_EXEC: (void) do_exec(q); break; + case Q_EXIT: + abort_flag= 1; + break; default: processed = 0; break; } } |