diff options
| author | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2021-04-10 15:28:33 +0000 |
|---|---|---|
| committer | Li-Wen Hsu <lwhsu@FreeBSD.org> | 2021-04-10 15:29:49 +0000 |
| commit | c37395fe14b1401f7e5502f35b6d540d9b8e92e3 (patch) | |
| tree | b25cc823a6f2a0400070f439ec19ad364214aacf /databases | |
| parent | 5643d688df5efe215689897a25b0f88a6b65a5bd (diff) | |
| download | ports-c37395fe14b1401f7e5502f35b6d540d9b8e92e3.tar.gz ports-c37395fe14b1401f7e5502f35b6d540d9b8e92e3.zip | |
databases/mysqlwsrep57-server: Update to 5.7.33-25.25
PR: 254882
Reported by: devel@galeracluster.com (maintainer)
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysqlwsrep57-server/Makefile | 15 | ||||
| -rw-r--r-- | databases/mysqlwsrep57-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc (renamed from databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working) | 0 | ||||
| -rw-r--r-- | databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc | 11 |
4 files changed, 23 insertions, 9 deletions
diff --git a/databases/mysqlwsrep57-server/Makefile b/databases/mysqlwsrep57-server/Makefile index 6471d37243ef..9e64d482087e 100644 --- a/databases/mysqlwsrep57-server/Makefile +++ b/databases/mysqlwsrep57-server/Makefile @@ -1,9 +1,9 @@ # Created by: Vasil Dimov <vd@FreeBSD.org> PORTNAME= mysqlwsrep -PORTVERSION?= 5.7.31 +PORTVERSION?= 5.7.33 DISTVERSIONPREFIX?= wsrep_ -DISTVERSIONSUFFIX?= -25.23 +DISTVERSIONSUFFIX?= -25.25 PORTREVISION?= 1 CATEGORIES= databases MASTER_SITES+= SF/boost/boost/1.59.0:boost @@ -98,7 +98,7 @@ SUB_FILES= my.cnf.sample USERS= mysql GROUPS= mysql -USE_CXXSTD= c++11 +USE_CXXSTD= c++11 USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin MMAN1= my_print_defaults.1 \ @@ -152,14 +152,17 @@ OPTIONS_GROUP_FEATURES= PERFSCHM FEATURES_DESC= Default features knobs PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) OPTIONS_DEFAULT+= PERFSCHM - -PERFSCHM_SUB_LIST+= PERFSCHEMRC="" -PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" FEDERATED_SUB_LIST+= FEDER="--federated" FEDERATED_SUB_LIST_OFF+=FEDER="" .include <bsd.port.options.mk> +.if ${PORT_OPTIONS:MPERFSCHM} +SUB_LIST+= PERFSCHEMRC="" +.else +SUB_LIST+= PERFSCHEMRC="--skip-performance-schema" +.endif + .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else diff --git a/databases/mysqlwsrep57-server/distinfo b/databases/mysqlwsrep57-server/distinfo index b06d2bddf1b9..17189e6e9b0c 100644 --- a/databases/mysqlwsrep57-server/distinfo +++ b/databases/mysqlwsrep57-server/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1603213079 +TIMESTAMP = 1617281067 SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac SIZE (boost_1_59_0.tar.gz) = 83709983 -SHA256 (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 1a66f94778a37ce909e92e35eb3e5adb961708f105fe67281062185b93ab1945 -SIZE (codership-mysql-wsrep-wsrep_5.7.31-25.23_GH0.tar.gz) = 54754887 +SHA256 (codership-mysql-wsrep-wsrep_5.7.33-25.25_GH0.tar.gz) = 0a32cace737ba300f17562bf0b001e5e3bbc33808517636b108e38dfe4289ab6 +SIZE (codership-mysql-wsrep-wsrep_5.7.33-25.25_GH0.tar.gz) = 56532487 SHA256 (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 3c235868ed330d8d702e7b7541c24c1926b1fd9e6b8aa673b032a2318896e8a0 SIZE (codership-wsrep-API-eab2d5d5a31672c0b7d116ef1629ff18392fd7d0_GH0.tar.gz) = 47032 diff --git a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc index 267f774c1d8d..267f774c1d8d 100644 --- a/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc(working +++ b/databases/mysqlwsrep57-server/files/patch-rapid_plugin_group__replication_src_recovery__state__transfer.cc diff --git a/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc b/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc new file mode 100644 index 000000000000..44325de6c602 --- /dev/null +++ b/databases/mysqlwsrep57-server/files/patch-sql_locks_shared__spin__lock.cc @@ -0,0 +1,11 @@ +--- sql/locks/shared_spin_lock.cc.orig 2020-12-10 03:01:55 UTC ++++ sql/locks/shared_spin_lock.cc +@@ -239,7 +239,7 @@ lock::Shared_spin_lock &lock::Shared_spin_lock::try_or + { + this->spin_exclusive_lock(); + } +- my_atomic_store64(&this->m_exclusive_owner, self); ++ my_atomic_store64(&this->m_exclusive_owner, reinterpret_cast<int64>(self)); + return (*this); + } + |