summaryrefslogtreecommitdiff
path: root/sql/sql_prepare.cc
diff options
context:
space:
mode:
authorStaale Smedseng <staale.smedseng@sun.com>2009-05-20 16:17:47 +0200
committerStaale Smedseng <staale.smedseng@sun.com>2009-05-20 16:17:47 +0200
commit059dba14b774083ae63cde9ad41b00308f001ce7 (patch)
tree691854cf9107bcc79815bb5edc85db12eb62e191 /sql/sql_prepare.cc
parent0130162452e57c677ef71d16b28794c9abb48043 (diff)
downloadmariadb-git-059dba14b774083ae63cde9ad41b00308f001ce7.tar.gz
Recommit of bug 43560 after merge with mysql-5.1-bugteam
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r--sql/sql_prepare.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc
index cd11b6d4c24..cc7ea75dbbf 100644
--- a/sql/sql_prepare.cc
+++ b/sql/sql_prepare.cc
@@ -2461,6 +2461,9 @@ void mysql_stmt_execute(THD *thd, char *packet_arg, uint packet_length)
stmt->execute_loop(&expanded_query, open_cursor, packet, packet_end);
+ /* Close connection socket; for use with client testing (Bug#43560). */
+ DBUG_EXECUTE_IF("close_conn_after_stmt_execute", vio_close(thd->net.vio););
+
DBUG_VOID_RETURN;
}