Merge branch 'master' into 1.3.0-alpha

Conflicts:
	include/proxysql.h

Makefile

@@ -317,7 +317,7 @@ binaries/proxysql_${CURVER}-dbg-ubuntu16_amd64.deb:
 	docker exec ubuntu16_build bash -c "cd /opt/proxysql; ${MAKE} clean && ${MAKE} -j 4 build_deps && ${MAKE} debug"
 	docker cp docker/images/proxysql/ubuntu-16.04-build/proxysql.ctl ubuntu16_build:/opt/proxysql/
 	docker exec ubuntu16_build bash -c "cd /opt/proxysql; cp src/proxysql . ; equivs-build proxysql.ctl"
-	docker cp ubuntu16_build:/opt/proxysql/proxysql_${CURVER}_amd64.deb ./binaries/proxysql_${CURVER}-ubuntu16_amd64.deb
+	docker cp ubuntu16_build:/opt/proxysql/proxysql_${CURVER}_amd64.deb ./binaries/proxysql_${CURVER}-dbg-ubuntu16_amd64.deb
 	docker stop ubuntu16_build
 	docker rm ubuntu16_build
 

README.md

@@ -0,0 +1,12 @@
+Introduction
+============
+
+ProxySQL is a high performance, high availability, protocol aware proxy for MySQL and forks (like Percona Server and MariaDB).  
+All the while getting the unlimited freedom that comes with a GPL license.
+
+Its development is driven by the lack of open source proxies that provide high performance.  
+Ufficial website: http://www.proxysql.com/  
+Benchmarks and old blog posts can be found at http://www.proxysql.blogspot.com/  
+Forum: https://groups.google.com/forum/#proxysql/  
+
+Wiki: https://github.com/sysown/proxysql/wiki/  

README.rst

@@ -1,9 +0,0 @@
-============
-Introduction
-============
-
-ProxySQL is a high performance proxy, currently for MySQL and forks (like Percona Server and MariaDB) only.
-Future versions of ProxySQL will support a variety database backends.
-
-Its development is driven by the lack of open source proxies that provide high performance.
-Benchmarks can be found at http://www.proxysql.com

doc/release_notes/ProxySQL_v1.2.4.md

@@ -0,0 +1,25 @@
+# ProxySQL v1.2.4
+
+Release date: 2016-09-29
+
+## Performance improvement
+
+None
+
+## Usability improvement
+
+* Admin: Report in error log if unable to read config file [#705](../../../../issues/705)
+* Admin: Allow GO clients to connect to Admin interface using user "stats" [#708](../../../../issues/708)
+* Monitor: added [diamond Collector](../../diamond/) to export to graphite or similar
+
+## New features
+
+* Admin: introduced new variable status related to connection pool usage [#703](../../../../issues/703)
+* Protocol: filters SHOW WARNINGS , [#696](../../../../issues/696)
+
+## Bug fixes
+
+* Mirroring: crashing bug on mirrorred traffic and show mysql status [#699](../../../../issues/699)
+* Connection Pool: SSL did not work with RDS , [#700](../../../../issues/700)
+* Protocol: in some case, compressed packets were being corrupted [#297](../../../../issues/297)
+* Monitor: rows were not deleted from monitor tables [#704](../../../../issues/704)

lib/ProxySQL_Admin.cpp

@@ -2540,6 +2540,7 @@ bool ProxySQL_Admin::init() {
 	insert_into_tables_defs(tables_defs_stats,"stats_mysql_query_digest", STATS_SQLITE_TABLE_MYSQL_QUERY_DIGEST);
 	insert_into_tables_defs(tables_defs_stats,"stats_mysql_query_digest_reset", STATS_SQLITE_TABLE_MYSQL_QUERY_DIGEST_RESET);
 	insert_into_tables_defs(tables_defs_stats,"stats_mysql_global", STATS_SQLITE_TABLE_MYSQL_GLOBAL);
+	insert_into_tables_defs(tables_defs_stats,"global_variables", ADMIN_SQLITE_TABLE_GLOBAL_VARIABLES); // workaround for issue #708
 
 	// upgrade mysql_servers if needed (upgrade from previous version)
 	disk_upgrade_mysql_servers();
@@ -2579,6 +2580,10 @@ bool ProxySQL_Admin::init() {
 	__insert_or_replace_maintable_select_disktable();
 
 	flush_admin_variables___database_to_runtime(admindb,true);
+
+	// workaround for issue #708
+	statsdb->execute("INSERT OR IGNORE INTO global_variables VALUES('mysql-max_allowed_packet',4194304)");
+
 #ifdef DEBUG
 	if (GloVars.global.gdbg==false && GloVars.__cmd_proxysql_gdbg) {
 		proxy_debug(PROXY_DEBUG_ADMIN, 4, "Enabling GloVars.global.gdbg because GloVars.__cmd_proxysql_gdbg==%d\n", GloVars.__cmd_proxysql_gdbg);

src/main.cpp

@@ -181,6 +181,8 @@ void ProxySQL_Main_process_global_variables(int argc, const char **argv) {
 	// alwasy try to open a config file
 	if (GloVars.confFile->OpenFile(GloVars.config_file) == true) {
 		GloVars.configfile_open=true;
+	} else {
+		proxy_warning("Unable to open config file %s\n", GloVars.config_file); // issue #705
 	}
 	char *t=getcwd(NULL, 512);
 	if (GloVars.__cmd_proxysql_datadir==NULL) {