diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-07 11:22:45 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-07 11:22:45 +0100 |
| commit | e1b42965a5e95fd8ff331e5c9b84391688285448 (patch) | |
| tree | 3f7f7cc9ba3ac1bff157bf28daa7b20be375e115 /client | |
| parent | ed64190b232ed23974bc0dc11e8b586d8bfb6c71 (diff) | |
| download | mariadb-git-e1b42965a5e95fd8ff331e5c9b84391688285448.tar.gz | |
Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'
Undid amendment allowing pending reap after switching connections
Moved check for pending reap earlier; failed if running with ps-protocol
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index d0c58d2f57b..45f94982472 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -4622,7 +4622,6 @@ void select_connection_name(const char *name) if (!con) die("connection '%s' not found in connection pool", name); - con->pending= FALSE; set_current_connection(con); DBUG_VOID_RETURN; @@ -6517,9 +6516,6 @@ void run_query_normal(struct st_connection *cn, struct st_command *command, if (flags & QUERY_SEND_FLAG) { - if (cn->pending) - die ("Cannot run query on connection between send and reap"); - /* Send the query */ @@ -7111,6 +7107,9 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags) init_dynamic_string(&ds_warnings, NULL, 0, 256); + if (cn->pending && (flags & QUERY_SEND_FLAG)) + die ("Cannot run query on connection between send and reap"); + /* Evaluate query if this is an eval command */ |