From b8e490bcc29ae80f2cf93d44fdc6ea48c8ebc327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= <rene.cannao@gmail.com>
Date: Thu, 23 Nov 2017 15:22:07 +0100
Subject: [PATCH] Clean up query metadata when set autocommit fails #1257

---
 lib/MySQL_Session.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp
index b8f4010c2..51afe5a1d 100644
--- a/lib/MySQL_Session.cpp
+++ b/lib/MySQL_Session.cpp
@@ -1779,6 +1779,7 @@ bool MySQL_Session::handler_again___status_CHANGING_CHARSET(int *_rc) {
 				myds->fd=0;
 				status=WAITING_CLIENT_DATA;
 				client_myds->DSS=STATE_SLEEP;
+				RequestEnd(myds);
 			}
 		} else {
 			// rc==1 , nothing to do for now
@@ -1832,6 +1833,7 @@ bool MySQL_Session::handler_again___status_CHANGING_AUTOCOMMIT(int *_rc) {
 				client_myds->myprot.generate_pkt_ERR(true,NULL,NULL,1,mysql_errno(myconn->mysql),sqlstate,mysql_error(myconn->mysql));
 					myds->destroy_MySQL_Connection_From_Pool(true);
 					myds->fd=0;
+				RequestEnd(myds);
 				status=WAITING_CLIENT_DATA;
 				client_myds->DSS=STATE_SLEEP;
 			}