/**
 * @file test_conn_err_unkwn_db-t.cpp
 * @brief Memory leak reproduction.
 */

#include <cstring>
#include <stdio.h>

#include "mysql.h"

#include "tap.h"
#include "command_line.h"

const uint32_t DEF_CONN_COUNT { 1000 };

int main(int argc, char** argv) {
	CommandLine cl;

	if (cl.getEnv()) {
		diag("Failed to get the required environmental variables.");
		return EXIT_FAILURE;
	}

	uint32_t CONN_COUNT { argc >= 2 ? std::atoi(argv[1]) : DEF_CONN_COUNT };
	diag("Creating faulty backend connections   CONN_COUNT=%d", CONN_COUNT);

	while (CONN_COUNT) {
		CONN_COUNT -= 1;

		MYSQL* proxy = mysql_init(NULL);

		if (!mysql_real_connect(proxy, cl.host, cl.username, cl.password, NULL, cl.port, NULL, 0)) {
			fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(proxy));
			return EXIT_FAILURE;
		}

		mysql_query(proxy, "DO 1");
		mysql_select_db(proxy, "``");
		mysql_query(proxy, "DO 1");

		mysql_close(proxy);
	}

	return exit_status();
}

diff --git a/lib/MySQL_Monitor.cpp b/lib/MySQL_Monitor.cpp
index dfd67dec..bdb7abd5 100644
--- a/lib/MySQL_Monitor.cpp
+++ b/lib/MySQL_Monitor.cpp
@@ -79,6 +79,8 @@ class ConsumerThread : public Thread {
        // Remove 1 item at a time and process it. Blocks if no items are
        // available to process.
        for (int i = 0; (thrn ? i < thrn : 1); i++) {
+           if (m_queue.size() == 0) { break; }
+
            //VALGRIND_DISABLE_ERROR_REPORTING;
            WorkItem<T>* item = (WorkItem<T>*)m_queue.remove();
            //VALGRIND_ENABLE_ERROR_REPORTING;
@@ -5173,17 +5175,20 @@ __monitor_run:
                    qsize = threads_max * 2 - num_threads;
                }
                if (qsize > 0) {
+                   qsize = 100;
                    proxy_info("Monitor is starting %d helper threads\n", qsize);
                    ConsumerThread<MySQL_Monitor_State_Data> **threads_aux= (ConsumerThread<MySQL_Monitor_State_Data> **)malloc(sizeof(ConsumerThread<MySQL_Monitor_State_Data> *)*qsize);
                    aux_threads = qsize;
                    started_threads += aux_threads;
                    for (unsigned int i=0; i<qsize; i++) {
-                       threads_aux[i] = new ConsumerThread<MySQL_Monitor_State_Data>(*queue, 245, "MyMonStateData");
+                       threads_aux[i] = new ConsumerThread<MySQL_Monitor_State_Data>(*queue, 0, "MyMonStateData");
                        threads_aux[i]->start(2048,false);
                    }
                    for (unsigned int i=0; i<qsize; i++) {
                        threads_aux[i]->join();
                        delete threads_aux[i];
                    }
                    free(threads_aux);
                    aux_threads = 0;

ps aux | grep "[.]/src/proxysql" | awk '{ print ($5/1024),($6/1024),$11 }'
712.367 544.781 ./src/proxysql

ps aux | grep "[.]/src/proxysql" | awk '{ print ($5/1024),($6/1024),$11 }'
235.832 129.488 ./src/proxysql