Merge branch 'v2.0.0' of https://github.com/sysown/proxysql into v2.0.0

include/MySQL_HostGroups_Manager.h

@@ -305,7 +305,7 @@ class MySrvConnList {
 	}
 	MySQL_Connection *remove(int);
 	MySQL_Connection * get_random_MyConn(MySQL_Session *sess, bool ff);
-	unsigned int conns_length();
+	unsigned int conns_length() { return conns->len; }
 	void drop_all_connections();
 	MySQL_Connection *index(unsigned int);
 };
@@ -364,12 +364,12 @@ class MySrvList {	// MySQL Server List
 	int find_idx(MySrvC *);
 	public:
 	PtrArray *servers;
-	unsigned int cnt();
+	unsigned int cnt() { return servers->len; }
 	MySrvList(MyHGC *);
 	~MySrvList();
 	void add(MySrvC *);
 	void remove(MySrvC *);
-	MySrvC * idx(unsigned int);
+	MySrvC * idx(unsigned int i) {return (MySrvC *)servers->index(i); }
 };
 
 class MyHGC {	// MySQL Host Group Container

lib/MySQL_HostGroups_Manager.cpp

@@ -638,9 +638,11 @@ MySQL_Connection * MySrvConnList::remove(int _k) {
 	return (MySQL_Connection *)conns->remove_index_fast(_k);
 }
 
+/*
 unsigned int MySrvConnList::conns_length() {
 	return conns->len;
 }
+*/
 
 MySrvConnList::MySrvConnList(MySrvC *_mysrvc) {
 	mysrvc=_mysrvc;
@@ -2211,11 +2213,11 @@ MySrvC *MyHGC::get_random_MySrvC(char * gtid_uuid, uint64_t gtid_trxid) {
 	return NULL; // if we reach here, we couldn't find any target
 }
 
-unsigned int MySrvList::cnt() {
-	return servers->len;
-}
+//unsigned int MySrvList::cnt() {
+//	return servers->len;
+//}
 
-MySrvC * MySrvList::idx(unsigned int i) { return (MySrvC *)servers->index(i); }
+//MySrvC * MySrvList::idx(unsigned int i) { return (MySrvC *)servers->index(i); }
 
 MySQL_Connection * MySrvConnList::get_random_MyConn(MySQL_Session *sess, bool ff) {
 	MySQL_Connection * conn=NULL;

lib/ProxySQL_Admin.cpp

@@ -2657,7 +2657,7 @@ void admin_session_handler(MySQL_Session *sess, void *_pa, PtrSize_t *pkt) {
 	if (!strncasecmp("SELECT @@version", query_no_space, strlen("SELECT @@version"))) {
 		l_free(query_length,query);
 		char *q=(char *)"SELECT '%s' AS '@@version'";
-		query_length=strlen(q)+20;
+		query_length=strlen(q)+20+strlen(PROXYSQL_VERSION);
 		query=(char *)l_alloc(query_length);
 		sprintf(query,q,PROXYSQL_VERSION);
 		goto __run_query;
@@ -2666,7 +2666,7 @@ void admin_session_handler(MySQL_Session *sess, void *_pa, PtrSize_t *pkt) {
 	if (!strncasecmp("SELECT version()", query_no_space, strlen("SELECT version()"))) {
 		l_free(query_length,query);
 		char *q=(char *)"SELECT '%s' AS 'version()'";
-		query_length=strlen(q)+20;
+		query_length=strlen(q)+20+strlen(PROXYSQL_VERSION);
 		query=(char *)l_alloc(query_length);
 		sprintf(query,q,PROXYSQL_VERSION);
 		goto __run_query;
@@ -2881,7 +2881,7 @@ void admin_session_handler(MySQL_Session *sess, void *_pa, PtrSize_t *pkt) {
 	if (!strncasecmp("SHOW GLOBAL VARIABLES LIKE 'version'", query_no_space, strlen("SHOW GLOBAL VARIABLES LIKE 'version'"))) {
 		l_free(query_length,query);
 		char *q=(char *)"SELECT 'version' Variable_name, '%s' Value FROM global_variables WHERE Variable_name='admin-version'";
-		query_length=strlen(q)+20;
+		query_length=strlen(q)+20+strlen(PROXYSQL_VERSION);
 		query=(char *)l_alloc(query_length);
 		sprintf(query,q,PROXYSQL_VERSION);
 		goto __run_query;