From bfda39ea6f6d97d108eb6acb5e4e45602113378a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= <rene.cannao@gmail.com>
Date: Fri, 26 Jul 2019 16:15:50 +1000
Subject: [PATCH] Track capability flags in get_MyConn_local()

---
 lib/MySQL_Thread.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/MySQL_Thread.cpp b/lib/MySQL_Thread.cpp
index feb0bf765..72eba6428 100644
--- a/lib/MySQL_Thread.cpp
+++ b/lib/MySQL_Thread.cpp
@@ -5363,7 +5363,7 @@ MySQL_Connection * MySQL_Thread::get_MyConn_local(unsigned int _hid, MySQL_Sessi
 //	MySQL_Connection *_candidate = NULL; // this will be used when we will pass optional parameters
 	for (i=0; i<cached_connections->len; i++) {
 		c=(MySQL_Connection *)cached_connections->index(i);
-		if (c->parent->myhgc->hid==_hid) {
+		if (c->parent->myhgc->hid==_hid && sess->client_myds->myconn->match_tracked_options(c)) {
 
 			if (gtid_uuid) {
 				// we first check if we already excluded this parent (MySQL Server)