CVS commit: pkgsrc/databases

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases
From: "Jonathan Perkin" <jperkin%netbsd.org@localhost>
Date: Wed, 1 Feb 2023 16:38:13 +0000

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Feb  1 16:38:13 UTC 2023

Modified Files:
        pkgsrc/databases/mysql57-client: Makefile Makefile.common PLIST
            distinfo
        pkgsrc/databases/mysql57-server: Makefile PLIST
Removed Files:
        pkgsrc/databases/mysql57-client/patches: patch-cmake_boost.cmake

Log Message:
mysql57: Update to 5.7.41.

pkgsrc change: switch to bundled boost, this older release series no longer
builds against the latest pkgsrc version of boost.

Changes in MySQL 5.7.41 (2023-01-17, General Availability)

Compilation Notes

 * Upgraded the bundled lz4 library from version 1.9.3 to version 1.9.4. (Bug
   #34809802)

Functionality Added or Changed

 * Important Change: The linked OpenSSL library for MySQL Server has been
   updated to version 1.1.1s. Issues fixed in OpenSSL version 1.1.1s are
   described at https://www.openssl.org/news/cl111.txt. (Bug #34828308)

 * The linked curl library for MySQL Server (Enterprise Edition) has been
   updated to version 7.86.0. (Bug #34828111)

Bugs Fixed

 * Replication: Issuing STOP SLAVE SQL_THREAD while the SQL thread was handling
   a transaction caused replication to stop immediately, instead of waiting 60
   seconds for the event group to complete before shutting down the SQL thread
   as expected.

   The root cause of this issue was due to the internal variable storing the
   last event start time not being reset after the SQL thread was restarted.

   We fix this by resetting the variable holding the last event start time
   whenever the SQL thread is started. (Bug #33646899)

 * Replication: The relay_log_space_limit system variable is a 64-bit value,
   but its valid maximum was specified internally as that of a 32-bit value.
   (Bug #106323, Bug #33799840)

 * Some remote connections to the server were not handled correctly. This issue
   arose as the result of a previous fix for an issue with
   require_secure_transport. (Bug #34857411)

   References: This issue is a regression of: Bug #34094706.

 * The linked OpenLDAP library for MySQL Server (Enterprise edition) was
   updated to version 2.5.13. (Bug #34815046)

 * The bundled zlib library has been upgraded to zlib 1.2.13; zlib 1.2.13 is
   now the minimum zlib version supported. (Bug #34711762)

 * Stack overruns could be erroneously reported when using the thread pool
   under heavy load. The race condition causing this in the thread pool has
   been avoided with an additional thread group ID check. (Bug #34414959)

 * The data and the GTIDs backed up by mysqldump were inconsistent when the
   options --single-transaction and --set-gtid-purged=ON were both used. It was
   because GTID_EXECUTED was fetched at the end of the dump, at which point the
   GTIDs on the server could have increased already. With this fixed, a FLUSH
   TABLES WITH READ LOCK is performed at the beginning of the dump and
   GTID_EXECUTED was fetched right after, to ensure its value is consistent
   with the snapshot taken by mysqldump.

   Our thanks to Marcelo Altmann for the contribution. (Bug #33630199)

 * In prepared statements, some types of subqueries could cause a server exit.
   (Bug #33100586)

 * The audit_log server-side plugin always logged an entire multiple query,
   rather than logging only the specific part of the query that was executed.
   Changing when the query length is set resolves the issue. (Bug #107390, Bug
   #34207811)


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 pkgsrc/databases/mysql57-client/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/databases/mysql57-client/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/mysql57-client/PLIST
cvs rdiff -u -r1.50 -r1.51 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.11 -r0 \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_boost.cmake
cvs rdiff -u -r1.46 -r1.47 pkgsrc/databases/mysql57-server/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/mysql57-server/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql57-client/Makefile
diff -u pkgsrc/databases/mysql57-client/Makefile:1.45 pkgsrc/databases/mysql57-client/Makefile:1.46
--- pkgsrc/databases/mysql57-client/Makefile:1.45       Sun Jan 22 16:28:21 2023
+++ pkgsrc/databases/mysql57-client/Makefile    Wed Feb  1 16:38:12 2023
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2023/01/22 16:28:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2023/02/01 16:38:12 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   1
 COMMENT=       MySQL 5, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]*

Index: pkgsrc/databases/mysql57-client/Makefile.common
diff -u pkgsrc/databases/mysql57-client/Makefile.common:1.39 pkgsrc/databases/mysql57-client/Makefile.common:1.40
--- pkgsrc/databases/mysql57-client/Makefile.common:1.39        Sun Oct 30 12:53:55 2022
+++ pkgsrc/databases/mysql57-client/Makefile.common     Wed Feb  1 16:38:12 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.39 2022/10/30 12:53:55 adam Exp $
+# $NetBSD: Makefile.common,v 1.40 2023/02/01 16:38:12 jperkin Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=      mysql-5.7.40
+DISTNAME=      mysql-5.7.41
 CATEGORIES=    databases
 #MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-5.7/}
 MASTER_SITES=  https://dev.mysql.com/get/Downloads/MySQL-5.7/
@@ -12,6 +12,10 @@ MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.mysql.com/
 LICENSE=       gnu-gpl-v2
 
+BOOST=                 boost_1_59_0
+DISTFILES=             ${DISTNAME}${EXTRACT_SUFX} ${BOOST}.tar.bz2
+SITES.${BOOST}.tar.bz2=        ${MASTER_SITE_SOURCEFORGE:=boost/}
+
 DISTINFO_FILE?=        ${.CURDIR}/../../databases/mysql57-client/distinfo
 PATCHDIR?=     ${.CURDIR}/../../databases/mysql57-client/patches
 
@@ -65,7 +69,7 @@ CMAKE_ARGS+=  -DMYSQL_DATADIR=${MYSQL_DAT
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE=Release
 
-CMAKE_ARGS+=   -DWITH_BOOST="system"
+CMAKE_ARGS+=   -DWITH_BOOST=${WRKDIR}/${BOOST}
 CMAKE_ARGS+=   -DWITH_EDITLINE="system"
 CMAKE_ARGS+=   -DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/${BUILDLINK_INCDIRS.editline}
 CMAKE_ARGS+=   -DWITH_LIBEVENT="system"
@@ -119,14 +123,7 @@ USE_BUILTIN.editline=      no
 
 CHECK_PORTABILITY_SKIP+=       packaging/deb-in/mysql-packagesource-server.config.in
 
-# Remove internal boost. Even though external boost is detected, the build might fail.
-post-extract: remove-boost
-.PHONY: remove-boost
-remove-boost:
-       ${RM} -f -r ${WRKSRC}/include/boost_1_59_0
-
 .include "../../archivers/lz4/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/editline/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/databases/mysql57-client/PLIST
diff -u pkgsrc/databases/mysql57-client/PLIST:1.26 pkgsrc/databases/mysql57-client/PLIST:1.27
--- pkgsrc/databases/mysql57-client/PLIST:1.26  Sun Oct 30 12:53:55 2022
+++ pkgsrc/databases/mysql57-client/PLIST       Wed Feb  1 16:38:12 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2022/10/30 12:53:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.27 2023/02/01 16:38:12 jperkin Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -122,7 +122,7 @@ include/mysql/typelib.h
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.20
-lib/libmysqlclient.so.20.3.27
+lib/libmysqlclient.so.20.3.28
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1

Index: pkgsrc/databases/mysql57-client/distinfo
diff -u pkgsrc/databases/mysql57-client/distinfo:1.50 pkgsrc/databases/mysql57-client/distinfo:1.51
--- pkgsrc/databases/mysql57-client/distinfo:1.50       Sun Oct 30 12:53:55 2022
+++ pkgsrc/databases/mysql57-client/distinfo    Wed Feb  1 16:38:12 2023
@@ -1,13 +1,15 @@
-$NetBSD: distinfo,v 1.50 2022/10/30 12:53:55 adam Exp $
+$NetBSD: distinfo,v 1.51 2023/02/01 16:38:12 jperkin Exp $
 
-BLAKE2s (mysql-5.7.40.tar.gz) = bef0a0126f3ab1c9c25818b7ea43d6fe4414a764aed1e48efffba753a0253441
-SHA512 (mysql-5.7.40.tar.gz) = 5504ff4135f604000f7c3a4d3402d223021069311d905ae7d8e82c286281ebe07b5b5d384f50f2cd590501fe35b58c71782caa81512d54bab09332f727233923
-Size (mysql-5.7.40.tar.gz) = 56523688 bytes
+BLAKE2s (boost_1_59_0.tar.bz2) = 8738bf3fbcfd42ce18f2f9e2b9f49f496d3a84c038ace73b02f72889ad7da49b
+SHA512 (boost_1_59_0.tar.bz2) = 8139e1ae997a86974071c5714ad3307e3d8fd15ef702b81a953410dd4d424b932135f53a0ef4891d9b9b747a38e539e66d6a803388fe0cc98e5166be872d682a
+Size (boost_1_59_0.tar.bz2) = 70389425 bytes
+BLAKE2s (mysql-5.7.41.tar.gz) = 6cb4ea06ff270855a0b06220db2bfbdaa13035a877281c579c7aa705e586bd14
+SHA512 (mysql-5.7.41.tar.gz) = b2085cf2eee6c3ab4cce88be4eec8a3ac4ffb21556d2824eae9e459f4771034ae2aff725ee441164440d13792f3f30707ca3129d5b36ebbf197f864b06a5b1fa
+Size (mysql-5.7.41.tar.gz) = 56535698 bytes
 SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
 SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
-SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2
 SHA1 (patch-cmake_build__configurations_compiler__options.cmake) = 999110815237c53a69c74c42e66c45df83cbf355
 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6
 SHA1 (patch-cmake_curl.cmake) = 08ff31eb8de6b94a46ff90edb6df66a61a94fd9d

Index: pkgsrc/databases/mysql57-server/Makefile
diff -u pkgsrc/databases/mysql57-server/Makefile:1.46 pkgsrc/databases/mysql57-server/Makefile:1.47
--- pkgsrc/databases/mysql57-server/Makefile:1.46       Sun Jan 22 16:28:21 2023
+++ pkgsrc/databases/mysql57-server/Makefile    Wed Feb  1 16:38:13 2023
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.46 2023/01/22 16:28:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.47 2023/02/01 16:38:13 jperkin Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       MySQL 5, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*
 
 .include "../../databases/mysql57-client/Makefile.common"
 
+INFO_FILES=    yes
+
 CMAKE_ARGS+=   -DINSTALL_INFODIR=${PKGINFODIR}
 
 PLIST_VARS+=   embedded auth_socket

Index: pkgsrc/databases/mysql57-server/PLIST
diff -u pkgsrc/databases/mysql57-server/PLIST:1.25 pkgsrc/databases/mysql57-server/PLIST:1.26
--- pkgsrc/databases/mysql57-server/PLIST:1.25  Sun Oct 30 12:53:55 2022
+++ pkgsrc/databases/mysql57-server/PLIST       Wed Feb  1 16:38:13 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2022/10/30 12:53:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2023/02/01 16:38:13 jperkin Exp $
 bin/innochecksum
 bin/lz4_decompress
 bin/my_print_defaults
@@ -27,6 +27,7 @@ bin/zlib_decompress
 include/mysql/mysqlx_ername.h
 include/mysql/mysqlx_error.h
 include/mysql/mysqlx_version.h
+info/mysql.info
 ${PLIST.embedded}lib/libmysqld.a
 lib/libmysqlservices.a
 lib/mysql/plugin/adt_null.so
@@ -2298,6 +2299,7 @@ share/mysql/test/suite/audit_null/r/gene
 share/mysql/test/suite/audit_null/r/general_error_abort_ps.result
 share/mysql/test/suite/audit_null/r/general_log_abort.result
 share/mysql/test/suite/audit_null/r/general_log_abort_ps.result
+share/mysql/test/suite/audit_null/r/multiqueries.result
 share/mysql/test/suite/audit_null/t/audit_plugin-master.opt
 share/mysql/test/suite/audit_null/t/audit_plugin.test
 share/mysql/test/suite/audit_null/t/audit_plugin_2-master.opt
@@ -2312,6 +2314,8 @@ share/mysql/test/suite/audit_null/t/gene
 share/mysql/test/suite/audit_null/t/general_log_abort.test
 share/mysql/test/suite/audit_null/t/general_log_abort_ps-master.opt
 share/mysql/test/suite/audit_null/t/general_log_abort_ps.test
+share/mysql/test/suite/audit_null/t/multiqueries-master.opt
+share/mysql/test/suite/audit_null/t/multiqueries.test
 share/mysql/test/suite/auth_sec/include/have_openssl.inc
 share/mysql/test/suite/auth_sec/include/have_sha256_rsa_auth.inc
 share/mysql/test/suite/auth_sec/include/have_ssl.inc
@@ -9664,6 +9668,7 @@ share/mysql/test/suite/rpl/include/rpl_r
 share/mysql/test/suite/rpl/my.cnf
 share/mysql/test/suite/rpl/r/default_row_format_01.result
 share/mysql/test/suite/rpl/r/default_row_format_02.result
+share/mysql/test/suite/rpl/r/mysqldump_bug33630199.result
 share/mysql/test/suite/rpl/r/rpl000001.a.result
 share/mysql/test/suite/rpl/r/rpl000001.b.result
 share/mysql/test/suite/rpl/r/rpl_0.result
@@ -10276,6 +10281,7 @@ share/mysql/test/suite/rpl/r/rpl_stm_unt
 share/mysql/test/suite/rpl/r/rpl_stm_user_variables.result
 share/mysql/test/suite/rpl/r/rpl_stop_slave.result
 share/mysql/test/suite/rpl/r/rpl_stop_slave_threads_error.result
+share/mysql/test/suite/rpl/r/rpl_stop_slave_with_non_transactional_update.result
 share/mysql/test/suite/rpl/r/rpl_switch_stm_row_mixed.result
 share/mysql/test/suite/rpl/r/rpl_sync.result
 share/mysql/test/suite/rpl/r/rpl_sync_relay_log_info.result
@@ -10341,6 +10347,9 @@ share/mysql/test/suite/rpl/t/default_row
 share/mysql/test/suite/rpl/t/default_row_format_02-slave.opt
 share/mysql/test/suite/rpl/t/default_row_format_02.test
 share/mysql/test/suite/rpl/t/disabled.def
+share/mysql/test/suite/rpl/t/mysqldump_bug33630199.cnf
+share/mysql/test/suite/rpl/t/mysqldump_bug33630199.opt
+share/mysql/test/suite/rpl/t/mysqldump_bug33630199.test
 share/mysql/test/suite/rpl/t/rpl_0.test
 share/mysql/test/suite/rpl/t/rpl_000010-slave.opt
 share/mysql/test/suite/rpl/t/rpl_000010.test
@@ -11297,6 +11306,7 @@ share/mysql/test/suite/rpl/t/rpl_stm_use
 share/mysql/test/suite/rpl/t/rpl_stop_slave.test
 share/mysql/test/suite/rpl/t/rpl_stop_slave_threads_error-slave.opt
 share/mysql/test/suite/rpl/t/rpl_stop_slave_threads_error.test
+share/mysql/test/suite/rpl/t/rpl_stop_slave_with_non_transactional_update.test
 share/mysql/test/suite/rpl/t/rpl_switch_stm_row_mixed-master.opt
 share/mysql/test/suite/rpl/t/rpl_switch_stm_row_mixed.test
 share/mysql/test/suite/rpl/t/rpl_sync-master.opt

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index