From 5cd1a6a93ec39dabeb304d171738ae06be32070a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Mon, 11 Nov 2019 16:54:28 +1100 Subject: [PATCH 1/2] gitignore for mariadb-connector-c-3.1.4 --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ddb181f77..4aa935421 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,8 @@ deps/mariadb-client-library/mariadb-connector-c-2.1.0-src/ deps/mariadb-client-library/mariadb-connector-c-2.3.1/ deps/mariadb-client-library/mariadb-connector-c-3.0.2-src/ deps/mariadb-client-library/mariadb-connector-c-3.0.9-src/ +deps/mariadb-client-library/mariadb-connector-c-3.1.4-src/ +deps/mariadb-client-library/mariadb-connector-c-3.1.4-src.tar.gz #glib deps/glib/glib-2.40.0/ From a09efe634e1ff2695ffed94e7134c4cc70300c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Wed, 13 Nov 2019 22:19:36 +1100 Subject: [PATCH 2/2] More verbose output if KILL fails --- lib/MySQL_Session.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/MySQL_Session.cpp b/lib/MySQL_Session.cpp index 6474db6a2..a299fddbc 100644 --- a/lib/MySQL_Session.cpp +++ b/lib/MySQL_Session.cpp @@ -148,6 +148,7 @@ void * kill_query_thread(void *arg) { ret=mysql_real_connect(mysql,"localhost",ka->username,ka->password,NULL,0,ka->hostname,0); } if (!ret) { + proxy_error("Failed to connect to server %s:%d to run KILL %s %llu: Error: %s\n" , ka->hostname, ka->port, ( ka->kill_type==KILL_QUERY ? "QUERY" : "CONNECTION" ) , ka->id, mysql_error(mysql)); goto __exit_kill_query_thread; } char buf[100];