diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-12-16 10:06:37 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-12-16 10:06:37 +0100 |
| commit | a88898e692dd1fcbeb4fc21ef2afee199769afb1 (patch) | |
| tree | 35292c4e0e747ae83730650733e239b10637f394 /client | |
| parent | 50ab925e046f197daa97057158fda532f6fe1c81 (diff) | |
| download | mariadb-git-a88898e692dd1fcbeb4fc21ef2afee199769afb1.tar.gz | |
backport mysqltest send_eval from 42520
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 3cd87bd3236..7f758e7c306 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -280,7 +280,7 @@ enum enum_commands { Q_SEND_QUIT, Q_CHANGE_USER, Q_MKDIR, Q_RMDIR, Q_LIST_FILES, Q_LIST_FILES_WRITE_FILE, Q_LIST_FILES_APPEND_FILE, Q_SEND_SHUTDOWN, Q_SHUTDOWN_SERVER, - Q_MOVE_FILE, + Q_MOVE_FILE, Q_SEND_EVAL, Q_UNKNOWN, /* Unknown command. */ Q_COMMENT, /* Comments, ignored. */ @@ -378,6 +378,7 @@ const char *command_names[]= "send_shutdown", "shutdown_server", "move_file", + "send_eval", 0 }; @@ -7047,7 +7048,7 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags) /* Evaluate query if this is an eval command */ - if (command->type == Q_EVAL) + if (command->type == Q_EVAL || command->type == Q_SEND_EVAL) { init_dynamic_string(&eval_query, "", command->query_len+256, 1024); do_eval(&eval_query, command->query, command->end, FALSE); @@ -7866,6 +7867,7 @@ int main(int argc, char **argv) break; } case Q_SEND: + case Q_SEND_EVAL: if (!*command->first_argument) { /* |