From 4b14f4e3f3bc7f2863cc3b476666b6f54494adb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Sun, 24 Jul 2016 09:21:45 +0000 Subject: [PATCH] Changing version back from 1.3 to 1.2.1 --- Makefile | 2 +- doc/monitor.md | 8 ++++---- docker/images/proxysql/centos67-build/proxysql.spec | 2 +- docker/images/proxysql/centos7-build/proxysql.spec | 5 ++--- docker/images/proxysql/debian-7.8-build/proxysql.ctl | 2 +- docker/images/proxysql/debian-8.2-build/proxysql.ctl | 2 +- docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl | 2 +- docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl | 2 +- docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl | 2 +- include/proxysql.h | 4 ++-- 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 70635b167..927c3a0c3 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ DEBUG=${ALL_DEBUG} #export DEBUG #export OPTZ #export EXTRALINK -CURVER=1.3 +CURVER=1.2.1 .PHONY: default default: build_deps build_lib build_src diff --git a/doc/monitor.md b/doc/monitor.md index 946a4d421..06ccb1a4c 100644 --- a/doc/monitor.md +++ b/doc/monitor.md @@ -1,7 +1,7 @@ Monitor Module ============== -This section focus on Monitor v1.3, as it introduces multiple improved compared to v1.2 +This section focus on Monitor v1.2.1, as it introduces multiple improved compared to v1.2.0 Variables removed as unused or deprecated: @@ -101,12 +101,12 @@ The Monitor Module has several internal threads. There are currently 5 main thre * monitor_ping_thread: main thread and scheduler for the ping checks * monitor_read_only_thread: main thread and scheduler for the read only checks * monitor_replication_lag_thread: main thread and scheduler for the replication lag checks -Up to version v1.2 the above threads but *Monitor* were also responsible to perform the checks +Up to version v1.2.0 the above threads but *Monitor* were also responsible to perform the checks Thread Pool =========== -The implementation in v1.2 has a limitation with SSL implementation: with SSL, `connect()` is a blocking call, causing the threads to stall while performing the connect phase. -Version v1.3 tries to overcome this limitation with a new implementation. Now: +The implementation in v1.2.0 has a limitation with SSL implementation: with SSL, `connect()` is a blocking call, causing the threads to stall while performing the connect phase. +Version v1.2.1 tries to overcome this limitation with a new implementation. Now: * *Monitor* initializes a Thread Pool of workers and creates a queue; * *monitor_connect_thread*, *monitor_ping_thread*, *monitor_read_only_thread* and *monitor_replication_lag_thread* are producers that generate tasks and sent them to the workers using the queue; * the workers process the tasks and perform the requires actions; diff --git a/docker/images/proxysql/centos67-build/proxysql.spec b/docker/images/proxysql/centos67-build/proxysql.spec index 50e16de0f..d99c8f4df 100644 --- a/docker/images/proxysql/centos67-build/proxysql.spec +++ b/docker/images/proxysql/centos67-build/proxysql.spec @@ -7,7 +7,7 @@ Summary: A high-performance MySQL proxy Name: proxysql -Version: 1.3 +Version: 1.2.1 Release: 1 License: GPL+ Group: Development/Tools diff --git a/docker/images/proxysql/centos7-build/proxysql.spec b/docker/images/proxysql/centos7-build/proxysql.spec index d9ea208aa..15ccd98b4 100644 --- a/docker/images/proxysql/centos7-build/proxysql.spec +++ b/docker/images/proxysql/centos7-build/proxysql.spec @@ -7,7 +7,7 @@ Summary: A high-performance MySQL proxy Name: proxysql -Version: 1.3 +Version: 1.2.1 Release: 1 License: GPL+ Group: Development/Tools @@ -50,8 +50,7 @@ chkconfig --del %{name} %{_sysconfdir}/init.d/%{name} %changelog -* Sat Jul 23 2016 Rene Cannao 1.3 -* Fri Jul 22 2016 Rene Cannao 1.2.1 +* Sun Jul 24 2016 Rene Cannao 1.2.1 * Mon Mar 14 2016 Rene Cannao 1.2.0 - First testing release of 1.2 * Sat Mar 11 2016 Rene Cannao 1.1.2 diff --git a/docker/images/proxysql/debian-7.8-build/proxysql.ctl b/docker/images/proxysql/debian-7.8-build/proxysql.ctl index c6bd091e7..912e39854 100644 --- a/docker/images/proxysql/debian-7.8-build/proxysql.ctl +++ b/docker/images/proxysql/debian-7.8-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.3 +Version: 1.2.1 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/debian-8.2-build/proxysql.ctl b/docker/images/proxysql/debian-8.2-build/proxysql.ctl index c6bd091e7..912e39854 100644 --- a/docker/images/proxysql/debian-8.2-build/proxysql.ctl +++ b/docker/images/proxysql/debian-8.2-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.3 +Version: 1.2.1 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl b/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl index c6bd091e7..912e39854 100644 --- a/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-12.04-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.3 +Version: 1.2.1 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl b/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl index c6bd091e7..912e39854 100644 --- a/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-14.04-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.3 +Version: 1.2.1 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl b/docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl index c6bd091e7..912e39854 100644 --- a/docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl +++ b/docker/images/proxysql/ubuntu-15.10-build/proxysql.ctl @@ -4,7 +4,7 @@ Homepage: http://www.proxysql.com Standards-Version: 3.9.2 Package: proxysql -Version: 1.3 +Version: 1.2.1 Maintainer: Rene Cannao Architecture: amd64 # Changelog: CHANGELOG.md diff --git a/include/proxysql.h b/include/proxysql.h index 85ba9fa25..506a7fe3c 100644 --- a/include/proxysql.h +++ b/include/proxysql.h @@ -85,8 +85,8 @@ #else #define DEB "" #endif /* DEBUG */ -#define PROXYSQL_VERSION "1.3" DEB -#define PROXYSQL_CODENAME "Xenon" +#define PROXYSQL_VERSION "1.2.1" DEB +#define PROXYSQL_CODENAME "Truls" #ifndef PROXYSQL_FUNC_DEFS #define PROXYSQL_FUNC_DEFS