summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2010-01-06 12:56:22 +0100
committerBjorn Munch <Bjorn.Munch@sun.com>2010-01-06 12:56:22 +0100
commited64190b232ed23974bc0dc11e8b586d8bfb6c71 (patch)
treecfa7deb48dd35490016e27c8e225a81337fe03fb /client
parent90b24e992e7c55d76e8d35c419d55403b52d961f (diff)
downloadmariadb-git-ed64190b232ed23974bc0dc11e8b586d8bfb6c71.tar.gz
Bug #49269 mysqltest crashes on 'reap' if query executed after 'send'
Small amendment: ignore pending reap when switching connection, add test
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 804db8fbefe..d0c58d2f57b 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -4622,6 +4622,7 @@ 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;