diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-07 11:28:35 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2010-01-07 11:28:35 +0100 |
| commit | 8b166f6d288f25225f9d1533136510b14eb89094 (patch) | |
| tree | ad6293ff124a723a8e19f6d72333ac8bb36e14b4 /client/mysqltest.cc | |
| parent | 3d3fad200085c271364b02aa5af020c8249c780f (diff) | |
| parent | 73c93ea34cc169d3ea84c75a35bfc198fb28768b (diff) | |
| download | mariadb-git-8b166f6d288f25225f9d1533136510b14eb89094.tar.gz | |
upmerge 49269 amendment
Diffstat (limited to 'client/mysqltest.cc')
| -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 52c0c78c902..b4b3b535968 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -4641,7 +4641,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; @@ -6575,9 +6574,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 */ @@ -7162,6 +7158,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 */ |