sysown · renecannao · Apr 3, 2020 · Apr 14, 2020 · Apr 15, 2020 · Apr 26, 2020
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -1,17 +1,23 @@
-This is the place for paid support and community users to report a **reproducible bug** in ProxySQL, suggest enhancements or make feature requests. This also includes documentation errors and/or missing documentation. 
+This is the place to report a **reproducible bug**, **documentation error** or **feature request** for ProxySQL.
 
-* Remember, this is the place for fixing and improving ProxySQL rather than the place to get free support. 
-* If you do not have a paid support contract please try https://groups.google.com/forum/#!forum/proxysql. Due to the high volume of requests, we are unable to always provide timely support for community users.
+Support questions will not be answered here. For community support, use the Google forum: https://groups.google.com/forum/#!forum/proxysql
+* Note that due to time constraints ProxySQL engineers may be slow to respond to forum posts
+* For information on paid support contracts: https://proxysql.com/services/support/
 
 If you are submitting a reproducible bug report, please provide:
-[ ] A clear description of your issue
-[ ] The version of OS and ProxySQL
-[ ] Every step to reproduce the issue
-[ ] The FULL error log (not just the last few lines)
-[ ] If it is a crashing bug, please check here: https://github.com/sysown/proxysql/wiki/How-to-report-a-crash-bug
+- [ ] A clear description of the issue
+- [ ] ProxySQL version
+- [ ] OS version
+- [ ] The steps to reproduce the issue
+- [ ] The **full** ProxySQL error log (default location: `/var/lib/proxysql/proxysql.log`)
 
-If the above is not provided, the issue is likely to be closed.
+If this is a crashing bug, please also include:
+- [ ] The package used to install ProxySQL
+- [ ] The compressed proxysql binary
+- [ ] The compressed core dump (Note: if you're worried it may contain sensitive data, please contact us for information on sharing it securely: https://proxysql.com/contact-us/)
 
-Please use markdown to format code or SQL: https://guides.github.com/features/mastering-markdown/
+If the above information is not provided, this issue is likely to be closed.
+
+Please use markdown to format any code or SQL: https://guides.github.com/features/mastering-markdown/
 
 Thank you!
diff --git a/.gitignore b/.gitignore
@@ -170,3 +170,6 @@ heaptrack.*
 
 #tap tests
 *-t
+
+#prometheus in 1.4
+deps/prometheus-cpp/prometheus-cpp-0.9.0/
diff --git a/Makefile b/Makefile
@@ -1,3 +1,10 @@
+ifndef GIT_VERSION
+GIT_VERSION := $(shell git describe --long)
+ifndef GIT_VERSION
+$(error GIT_VERSION is not set)
+endif
+endif
+
 O0=-O0
 O2=-O2
 O1=-O1
@@ -11,7 +18,7 @@ DEBUG=${ALL_DEBUG}
 #export OPTZ
 #export EXTRALINK
 export MAKE
-export CURVER?=2.0.10
+export CURVER?=2.0.13
 ifneq (,$(wildcard /etc/os-release))
 	DISTRO := $(shell gawk -F= '/^NAME/{print $$2}' /etc/os-release)
 else
@@ -157,7 +164,7 @@ clean:
 	cd src && ${MAKE} clean
 	cd test/tap && ${MAKE} clean
 
-packages: centos7 centos7-dbg centos7-clickhouse centos8 centos8-dbg centos8-clickhouse ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu16-clickhouse ubuntu18 ubuntu18-dbg ubuntu18-clickhouse debian8 debian8-dbg debian9 debian9-dbg debian9-clickhouse debian10 debian10-dbg debian10-clickhouse fedora24 fedora24-dbg  fedora24-clickhouse fedora27 fedora27-dbg fedora27-clickhouse fedora28 fedora28-dbg fedora28-clickhouse
+packages: centos6.7 centos6.7-dbg centos7 centos7-dbg centos7-clickhouse centos8 centos8-dbg centos8-clickhouse ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu16-clickhouse ubuntu18 ubuntu18-dbg ubuntu18-clickhouse debian8 debian8-dbg debian9 debian9-dbg debian9-clickhouse debian10 debian10-dbg debian10-clickhouse fedora24 fedora24-dbg  fedora24-clickhouse fedora27 fedora27-dbg fedora27-clickhouse fedora28 fedora28-dbg fedora28-clickhouse
 .PHONY: packages
 
 centos5: binaries/proxysql-${CURVER}-1-centos5.x86_64.rpm

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<a><img src="https://proxysql.com/assets/images/sm-share-default.png" alt="ProxySQL"></a>
+<a><img src="https://i0.wp.com/proxysql.com/wp-content/uploads/2020/04/ProxySQL-Colour-Logo.png?fit=800%2C278&ssl=1" alt="ProxySQL"></a>
 
 Introduction	
 ============	
@@ -143,7 +143,15 @@ Admin> proxysql restart
 
 #### Reinitializing ProxySQL from the config file (after first startup the DB file is used instead of the config file):
 ```bash
+# If you are using the init script run:
+/etc/init.d/proxysql initial
+# or
 service proxysql initial
+
+# If you are using the systemd unit file run:
+systemctl start proxysql-initial
+# or
+service proxysql-initial start
 ```
 
 ### Upgrades

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,32 +1,5 @@
 version: "2.0"
 services:
-  centos5_build:
-    image: proxysql/packaging:build-centos5
-    volumes:
-      - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/
-      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - MAKE
-      - MAKEOPT
-      - CURVER
-      - PKG_RELEASE=centos5
-    command:
-      - /opt/entrypoint/entrypoint.bash
-  centos5_dbg_build:
-    image: proxysql/packaging:build-centos5
-    volumes:
-      - ./docker/images/proxysql/rhel-compliant/rpmmacros/:/root/
-      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - MAKE
-      - MAKEOPT
-      - CURVER
-      - PKG_RELEASE=dbg-centos5
-      - PROXYSQL_BUILD_TYPE=debug
-    command:
-      - /opt/entrypoint/entrypoint.bash
   centos67_build:
     image: proxysql/packaging:build-centos6.7
     volumes:
@@ -261,33 +234,6 @@ services:
       - PROXYSQL_BUILD_TYPE=clickhouse
     command:
       - /opt/entrypoint/entrypoint.bash
-  debian7_build:
-    image: proxysql/packaging:build-debian7
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - MAKE
-      - MAKEOPT
-      - CURVER
-      - PKG_RELEASE=debian7
-    command:
-      - /opt/entrypoint/entrypoint.bash
-  debian7_dbg_build:
-    image: proxysql/packaging:build-debian7
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - MAKE
-      - MAKEOPT
-      - CURVER
-      - PKG_RELEASE=dbg-debian7
-      - PROXYSQL_BUILD_TYPE=debug
-    command:
-      - /opt/entrypoint/entrypoint.bash
   debian8_build:
     image: proxysql/packaging:build-debian8
     volumes:
@@ -438,33 +384,6 @@ services:
       - PROXYSQL_BUILD_TYPE=clickhouse
     command:
       - /opt/entrypoint/entrypoint.bash
-  ubuntu12_build:
-    image: proxysql/packaging:build-ubuntu12
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - MAKE
-      - MAKEOPT
-      - CURVER
-      - PKG_RELEASE=ubuntu12
-    command:
-      - /opt/entrypoint/entrypoint.bash
-  ubuntu12_dbg_build:
-    image: proxysql/packaging:build-ubuntu12
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - MAKE
-      - MAKEOPT
-      - CURVER
-      - PKG_RELEASE=dbg-ubuntu12
-      - PROXYSQL_BUILD_TYPE=debug
-    command:
-      - /opt/entrypoint/entrypoint.bash
   ubuntu14_build:
     image: proxysql/packaging:build-ubuntu14
     volumes:

diff --git a/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl b/docker/images/proxysql/deb-compliant/ctl/proxysql.ctl
@@ -1,17 +1,19 @@
 Section: misc
 Priority: optional
-Homepage: http://www.proxysql.com
+Homepage: https://proxysql.com
 Standards-Version: 3.9.2
 
 Package: proxysql
 Version: PKG_VERSION_CURVER
-Maintainer: Rene Cannao <rene.cannao@gmail.com>
+Maintainer: ProxySQL LLC <info@proxysql.com>
 Architecture: amd64
+Depends: libgnutls28 | libgnutls-deb0-28 | libgnutls30
 # Changelog: CHANGELOG.md
 # Readme: README.md
 Files: proxysql /usr/bin/
  etc/proxysql.cnf /
  etc/logrotate.d/proxysql /etc/logrotate.d/
+ systemd/system/proxysql-initial.service /lib/
  systemd/system/proxysql.service /lib/
  tools/proxysql_galera_checker.sh /usr/share/proxysql/
  tools/proxysql_galera_writer.pl /usr/share/proxysql/

diff --git a/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl b/docker/images/proxysql/deb-compliant/latest-package/ctl/proxysql.ctl
@@ -1,17 +1,19 @@
 Section: misc
 Priority: optional
-Homepage: http://www.proxysql.com
+Homepage: https://proxysql.com
 Standards-Version: 3.9.2
 
 Package: proxysql
 Version: PKG_VERSION_CURVER
-Maintainer: Rene Cannao <rene.cannao@gmail.com>
+Maintainer: ProxySQL LLC <info@proxysql.com>
 Architecture: amd64
+Depends: libgnutls28 | libgnutls30
 # Changelog: CHANGELOG.md
 # Readme: README.md
 Files: proxysql /usr/bin/
  etc/proxysql.cnf /etc/
  etc/logrotate.d/proxysql /etc/logrotate.d/
+ systemd/system/proxysql-initial.service /lib/systemd/system/
  systemd/system/proxysql.service /lib/systemd/system/
  tools/proxysql_galera_checker.sh /usr/share/proxysql/tools/
  tools/proxysql_galera_writer.pl /usr/share/proxysql/tools/

diff --git a/docker/images/proxysql/deb-compliant/pre-systemd/ctl/proxysql.ctl b/docker/images/proxysql/deb-compliant/pre-systemd/ctl/proxysql.ctl
@@ -1,12 +1,13 @@
 Section: misc
 Priority: optional
-Homepage: http://www.proxysql.com
+Homepage: https://proxysql.com
 Standards-Version: 3.9.2
 
 Package: proxysql
 Version: PKG_VERSION_CURVER
-Maintainer: Rene Cannao <rene.cannao@gmail.com>
+Maintainer: ProxySQL LLC <info@proxysql.com>
 Architecture: amd64
+Depends: libgnutls28 | libgnutls30 | libgnutls-deb0-28
 # Changelog: CHANGELOG.md
 # Readme: README.md
 Files: proxysql /usr/bin/

diff --git a/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec b/docker/images/proxysql/rhel-compliant/rhel7/rpmmacros/rpmbuild/SPECS/proxysql.spec
@@ -9,8 +9,8 @@ Release: 1
 License: GPL+
 Group: Development/Tools
 SOURCE0 : %{name}-%{version}.tar.gz
-URL: http://www.proxysql.com/
-
+URL: https://proxysql.com/
+Requires: gnutls
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -84,6 +84,7 @@ fi
 %config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/*
 %{_sysconfdir}/systemd/system/%{name}.service
+%{_sysconfdir}/systemd/system/%{name}-initial.service
 /usr/share/proxysql/tools/proxysql_galera_checker.sh
 /usr/share/proxysql/tools/proxysql_galera_writer.pl
 

diff --git a/docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/SPECS/proxysql.spec b/docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/SPECS/proxysql.spec
@@ -13,7 +13,7 @@ License: GPL+
 Group: Development/Tools
 SOURCE0 : %{name}-%{version}.tar.gz
 URL: http://www.proxysql.com/
-
+Requires: gnutls
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description

diff --git a/etc/init.d/proxysql b/etc/init.d/proxysql
@@ -18,7 +18,7 @@
 
 OLDDATADIR="/var/run/proxysql"
 DATADIR="/var/lib/proxysql"
-OPTS="-c /etc/proxysql.cnf -D $DATADIR"
+OPTS="--idle-threads -c /etc/proxysql.cnf -D $DATADIR"
 PIDFILE="$DATADIR/proxysql.pid"
 USER="proxysql"
 

diff --git a/etc/proxysql.cnf b/etc/proxysql.cnf
@@ -27,7 +27,7 @@
 #            file is only used to initial the on-disk database read on the first startup.
 #
 # In order to FORCE a re-initialise of the on-disk database from the configuration file 
-# the ProxySQL service should be started with "service proxysql initial".
+# the ProxySQL service should be started with "systemctl start proxysql-initial".
 #
 ########################################################################################
 

diff --git a/include/MySQL_HostGroups_Manager.h b/include/MySQL_HostGroups_Manager.h
@@ -6,6 +6,7 @@
 
 #include <thread>
 #include <iostream>
+#include <mutex>
 
 #include "thread.h"
 #include "wqueue.h"
@@ -313,6 +314,7 @@ class MySQL_HostGroups_Manager {
 	umap_mysql_errors mysql_errors_umap;
 
 	public:
+	std::mutex galera_set_writer_mutex;
 	pthread_rwlock_t gtid_rwlock;
 	std::unordered_map <string, GTID_Server_Data *> gtid_map;
 	struct ev_async * gtid_ev_async;

diff --git a/include/MySQL_Thread.h b/include/MySQL_Thread.h
@@ -306,7 +306,7 @@ class MySQL_Threads_Handler
 		char *interfaces;
 		char *server_version;
 		char *keep_multiplexing_variables;
-		unsigned int default_charset;
+		//unsigned int default_charset; // removed in 2.0.13 . Obsoleted previously using MySQL_Variables instead
 		unsigned int handle_unknown_charset;
 		bool servers_stats;
 		bool commands_stats;
@@ -394,6 +394,7 @@ class MySQL_Threads_Handler
 	} variables;
 	struct {
 		unsigned int mirror_sessions_current;
+		int threads_initialized = 0;
 	} status_variables;
 	unsigned int num_threads;
 	proxysql_mysql_thread_t *mysql_threads;

diff --git a/include/MySQL_Variables.h b/include/MySQL_Variables.h
@@ -28,6 +28,9 @@ class MySQL_Variables {
 	static verify_var verifiers[SQL_NAME_LAST];
 	static update_var updaters[SQL_NAME_LAST];
 
+public:
+	std::string variables_regexp;
+
 public:
 	MySQL_Variables();
 

diff --git a/include/mysql_connection.h b/include/mysql_connection.h
@@ -18,6 +18,7 @@ using json = nlohmann::json;
 #define STATUS_MYSQL_CONNECTION_SQL_LOG_BIN0         0x00000100
 #define STATUS_MYSQL_CONNECTION_FOUND_ROWS           0x00000200
 #define STATUS_MYSQL_CONNECTION_NO_BACKSLASH_ESCAPES 0x00000400
+#define STATUS_MYSQL_CONNECTION_HAS_SAVEPOINT        0x00000800
 
 class Variable {
 public:
@@ -146,6 +147,7 @@ class MySQL_Connection {
 	void set_status_no_backslash_escapes(bool);
 	void set_status_prepared_statement(bool);
 	void set_status_user_variable(bool);
+	void set_status_has_savepoint(bool);
 	void set_status_no_multiplex(bool);
 	void set_status_sql_log_bin0(bool);
 	void set_status_found_rows(bool);
@@ -157,6 +159,7 @@ class MySQL_Connection {
 	bool get_status_no_backslash_escapes();
 	bool get_status_prepared_statement();
 	bool get_status_user_variable();
+	bool get_status_has_savepoint();
 	bool get_status_no_multiplex();
 	bool get_status_sql_log_bin0();
 	bool get_status_found_rows();