summaryrefslogtreecommitdiff
path: root/storage/spider
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-08-30 13:06:13 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2017-08-30 13:06:13 +0300
commit829752973bd67bc4aaa9acf27dbc4715b62ade23 (patch)
treeb02e0d09d42406b62495a0cab3d0d33be56e84cd /storage/spider
parent4c91fd4cd62e3cfa8949d4f6265c79943390b2d2 (diff)
parenteb389d5c390969b17d433d7a8710d87aa8b55a5f (diff)
downloadmariadb-git-829752973bd67bc4aaa9acf27dbc4715b62ade23.tar.gz
Merge branch '10.0' into 10.1
Diffstat (limited to 'storage/spider')
-rw-r--r--storage/spider/spd_db_conn.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/storage/spider/spd_db_conn.cc b/storage/spider/spd_db_conn.cc
index 294fe92323c..d94c34d6772 100644
--- a/storage/spider/spd_db_conn.cc
+++ b/storage/spider/spd_db_conn.cc
@@ -4130,8 +4130,10 @@ void spider_db_discard_multiple_result(
if (!conn->db_conn->cmp_request_key_to_snd(&request_key))
break;
if ((result = conn->db_conn->use_result(&request_key, &error_num)))
+ {
result->free_result();
delete result;
+ }
} while (!conn->db_conn->next_result());
DBUG_VOID_RETURN;
}