From 2b7d080fd26095fd2bda748167dfc9c866f47acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Wed, 28 Sep 2016 23:08:49 +0000 Subject: [PATCH 1/8] Workaround for bug #708 An almost empty `global_variables` is added on stats schema. This will allow to run queries against it, even if empty. --- lib/ProxySQL_Admin.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/ProxySQL_Admin.cpp b/lib/ProxySQL_Admin.cpp index 811d487b7..4f6d3e6a4 100644 --- a/lib/ProxySQL_Admin.cpp +++ b/lib/ProxySQL_Admin.cpp @@ -2539,6 +2539,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(); @@ -2578,6 +2579,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); From a7b8bcde99b44b4014504122f64b05572622b287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Wed, 28 Sep 2016 23:36:25 +0000 Subject: [PATCH 2/8] Print a warning if unable to open configfile #705 --- src/main.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 13ed81a0f..cd7641861 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -179,6 +179,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) { From 2fead771351ab754fef37fe93e55930a546202d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Thu, 29 Sep 2016 22:04:56 +0000 Subject: [PATCH 3/8] Updating landing page --- README.rst | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index a4d20bbda..30f35f988 100644 --- a/README.rst +++ b/README.rst @@ -2,8 +2,12 @@ Introduction ============ -ProxySQL is a high performance proxy, currently for MySQL and forks (like Percona Server and MariaDB) only. +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 +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/ From 9157ce7e90aa70a45d2d1629a6a72d4844cecd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Thu, 29 Sep 2016 22:10:44 +0000 Subject: [PATCH 4/8] Updating landing page --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 30f35f988..a9ed4d4c1 100644 --- a/README.rst +++ b/README.rst @@ -2,8 +2,8 @@ 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. +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/ From 818b70481c8f5d5716bc5c31bc586f6f9a3ebb92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Thu, 29 Sep 2016 22:11:45 +0000 Subject: [PATCH 5/8] Changed to version 1.2.4 --- include/proxysql.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/proxysql.h b/include/proxysql.h index d70a1bebb..4084ea2ad 100644 --- a/include/proxysql.h +++ b/include/proxysql.h @@ -99,7 +99,7 @@ #else #define DEB "" #endif /* DEBUG */ -#define PROXYSQL_VERSION "1.2.4.0923" DEB +#define PROXYSQL_VERSION "1.2.4" DEB #define PROXYSQL_CODENAME "Truls" #ifndef PROXYSQL_FUNC_DEFS From fe71b9a6089b1ac7100120c0c05cda64f59dc31e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Thu, 29 Sep 2016 22:32:18 +0000 Subject: [PATCH 6/8] Release note for 1.2.4 --- doc/release_notes/ProxySQL_v1.2.4.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 doc/release_notes/ProxySQL_v1.2.4.md diff --git a/doc/release_notes/ProxySQL_v1.2.4.md b/doc/release_notes/ProxySQL_v1.2.4.md new file mode 100644 index 000000000..2fb0273f1 --- /dev/null +++ b/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) From 4a13de76a7f02841a8eb93aeb1683948383257b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Thu, 29 Sep 2016 15:48:25 -0700 Subject: [PATCH 7/8] Update and rename README.rst to README.md --- README.rst => README.md | 1 - 1 file changed, 1 deletion(-) rename README.rst => README.md (97%) diff --git a/README.rst b/README.md similarity index 97% rename from README.rst rename to README.md index a9ed4d4c1..337e1d0c1 100644 --- a/README.rst +++ b/README.md @@ -1,4 +1,3 @@ -============ Introduction ============ From 1ffe10662563b887c4592ccfccc7106f49073a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Thu, 29 Sep 2016 22:56:32 +0000 Subject: [PATCH 8/8] Compile ubuntu16 debug --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 40fb09db1..187ff00bf 100644 --- a/Makefile +++ b/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