summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorBjorn Munch <bjorn.munch@oracle.com>2010-09-10 13:08:06 +0200
committerBjorn Munch <bjorn.munch@oracle.com>2010-09-10 13:08:06 +0200
commit4937eec1a21cd53110f0067dc9fb4c8fc1e9d7cc (patch)
tree2f6f709b5c85285cf5842594af0f4c1cedbb1946 /client
parent7749cd8fd807683e2466b257d48f3850a6fb48c5 (diff)
downloadmariadb-git-4937eec1a21cd53110f0067dc9fb4c8fc1e9d7cc.tar.gz
Bug #56647 Valgrind warnings for memory leak in mysqltest.cc
Moved an init_dynamic_string() from before to after potential die()
Diffstat (limited to 'client')
-rw-r--r--client/mysqltest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index b7b7ad25d23..ec8aa0f0110 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -7309,11 +7309,10 @@ void run_query(struct st_connection *cn, struct st_command *command, int flags)
(flags & QUERY_REAP_FLAG));
DBUG_ENTER("run_query");
- 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");
+ init_dynamic_string(&ds_warnings, NULL, 0, 256);
/*
Evaluate query if this is an eval command
*/