Merge pull request #4801 from sysown/v2.7-fix_aux_threads_ssl_leaks

Fix leak of `SSL` caches for auxiliary threads

lib/MySQL_Monitor.cpp

@@ -89,7 +89,7 @@ class ConsumerThread : public Thread {
 					m_queue.add(item);
 				}
 				// this is intentional to EXIT immediately
-				return NULL;
+				goto cleanup;
 			}
 
 
@@ -109,6 +109,9 @@ class ConsumerThread : public Thread {
 			delete item->data;
 			delete item;
 		}
+cleanup:
+		// De-initializes per-thread structures. Required in all auxiliary threads using MySQL and SSL.
+		mysql_thread_end();
 		return NULL;
 	}
 };

lib/MySQL_Session.cpp

@@ -380,6 +380,8 @@ void* kill_query_thread(void *arg) {
 		delete ssl_params;
 		ssl_params = NULL;
 	}
+	// De-initializes per-thread structures. Required in all auxiliary threads using MySQL and SSL.
+	mysql_thread_end();
 	return NULL;
 }