Merge pull request #2392 from sysown/v2.0.9-kill2

V2.0.9 kill2
pull/2401/head
René Cannaò 7 years ago committed by GitHub
commit ee230166aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

2
.gitignore vendored

@ -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/

@ -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];

Loading…
Cancel
Save