diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-10-01 15:55:49 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-10-01 15:55:49 +0200 |
| commit | ad1824eed030ed1ce3e166c3d9faa02c339e12f7 (patch) | |
| tree | a54083ca11f5f49d853bafa981e7e23ec1a6934d | |
| parent | c84973c7e09139c46433810f215aff17e9b8062a (diff) | |
| parent | abaa5c91b4307750aeac4582753f2f4131cf4f6f (diff) | |
| download | mariadb-git-ad1824eed030ed1ce3e166c3d9faa02c339e12f7.tar.gz | |
upmerge 20304
| -rw-r--r-- | client/mysqltest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index f332767879c..b7861096aec 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -7427,6 +7427,9 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags) if (cn->pending && (flags & QUERY_SEND_FLAG)) die ("Cannot run query on connection between send and reap"); + if (!(flags & QUERY_SEND_FLAG) && !cn->pending) + die ("Cannot reap on a connection without pending send"); + init_dynamic_string(&ds_warnings, NULL, 0, 256); /* Evaluate query if this is an eval command |