Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C132684E5F for ; Mon, 10 Jul 2023 11:49:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 5mwXrxrzQVaR for ; Mon, 10 Jul 2023 11:49:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9576884CFE for ; Mon, 10 Jul 2023 11:49:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8E375FBDB; Mon, 10 Jul 2023 11:49:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1688989745208110" MIME-Version: 1.0 Date: Mon, 10 Jul 2023 11:49:05 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2023Q2] pkgsrc/databases To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20230710114905.8E375FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1688989745208110 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Mon Jul 10 11:49:05 UTC 2023 Modified Files: pkgsrc/databases/mariadb106-client [pkgsrc-2023Q2]: Makefile Makefile.common PLIST distinfo pkgsrc/databases/mariadb106-server [pkgsrc-2023Q2]: Makefile Log Message: Pullup ticket #6775 - requested by nia databases/mariadb106-client: security fix databases/mariadb106-server: security fix Revisions pulled up: - databases/mariadb106-client/Makefile 1.13 - databases/mariadb106-client/Makefile.common 1.17 - databases/mariadb106-client/PLIST 1.7 - databases/mariadb106-client/distinfo 1.15 - databases/mariadb106-server/Makefile 1.26 --- Module Name: pkgsrc Committed By: nia Date: Sat Jul 1 13:56:17 UTC 2023 Modified Files: pkgsrc/databases/mariadb106-client: Makefile Makefile.common PLIST distinfo pkgsrc/databases/mariadb106-server: Makefile Log Message: mariadb106: update to 10.6.14 MariaDB 10.6.14 Release Notes Notable Items InnoDB * Server crashes in st_join_table::choose_best_splitting (MDEV-31403) * Crash with condition pushable into derived and containing outer reference (MDEV-31240) * InnoDB does not free UNDO after the fix of MDEV-30671 (MDEV-31234) * InnoDB hang fixes (MDEV-31158, MDEV-31343, MDEV-31350) * Innodb_buffer_pool_read_requests is not updated correctly (MDEV-31309) * InnoDB monitor trx_rseg_history_len was accidentally disabled by default (MDEV-31308) * Revert "MDEV-30473 : Do not allow GET_LOCK() / RELEASE_LOCK() in cluster" Optimizer * Crash with condition pushable into derived and containing outer reference (MDEV-31403 MDEV-31240) * Crash with EXPLAIN EXTENDED for multi-table update of system table (MDEV-31224) MariaDB 10.6.13 Release Notes Notable Items InnoDB * Crash on ROLLBACK in a ROW_FORMAT=COMPRESSED table (MDEV-30882) * UNIQUE USING HASH accepts duplicate entries for tricky collations (MDEV-30034) * rec_get_offsets() is not optimal (MDEV-30567) * Performance regression in fil_space_t::try_to_close() introduced in MDEV-23855 (MDEV-30775) * InnoDB recovery hangs when buffer pool ran out of memory (MDEV-30551) * InnoDB undo log truncation fails to wait for purge of history (MDEV-30671 * MariaDB crash due to DB_FAIL reported for a corrupted page (MDEV-30397) * Deadlock between INSERT and InnoDB non-persistent statistics update (MDEV-30638) * InnoDB hang on B-tree split or merge (MDEV-29835) * Performance regression in locking reads from secondary indexes (MDEV-30357) * Improve adaptive flushing (MDEV-26055) * Make page flushing even faster (MDEV-26827) * Purge misses a chance to free not-yet-reused undo pages (MDEV-29593) * InnoDB temporary tablespace: reclaiming of free space does not work (MDEV-26782) * Fix miscount of doublewrites by Innodb_data_written (MDEV-31124) Backup * mariadb-backup doesn't utilise innodb-undo-log-directory (if specified as a relative path) during copy-back operation (MDEV-28187) * mariabackup issues error messages during InnoDB tablespaces export on partial backup preparing (MDEV-29050) * mariadb-backup does not copy Aria logs if aria_log_dir_path is used (MDEV-30968) * Race condition between buffer pool flush and log file deletion in mariadb-backup --prepare (MDEV-30860) Replication * Fixed a deadlock on parallel slave involving full image Write event on the sequence engine (MDEV-29621) * Fixed an attempted out-of-order binlogging error on slave involving ALTER on the sequence engine (MDEV-31077) * Corrected non-versioned master to versioned slave replication on no-unique attribute table (MDEV-30430) * Mended encrypted binlog master to error out to gtid-mode slave when master could not decrypt a binlog file (MDEV-28798) * Refined optimistic parallel slave to error-exit without any hang (MDEV-30780) * Ensured SHOW-SLAVE-STATUS is processed on the parallel slave having a necessary mutex always intialized (MDEV-30620) * Fixed the slave applier to report a correct error when gtid_slave_pos insert fails for some (engine) reasons (MDEV-31038) * Made parallel slave reports in performance schema consistent with that of show-slave-status (MDEV-26071) Optimizer * Split Materialized optimization is improved to re-fill the materialized table only if necessary. The fewer number of table refills is taken into account when choosing query plan, too (MDEV-26301). * New optimizer_switch option, hash_join_cardinality, is added. It is off by default. When set to ON, the optimizer will produce tighter bounds for hash join output cardinality. (MDEV-30812) * Queries using SELECT DISTINCT some_expression(aggregate_function()) could produce wrong query result. (MDEV-20057) * ANALYZE FORMAT=JSON now prints more information about Block Nested Loop joins: block-nl-join element now has r_loops, r_effective_rows and r_other_time_ms fields (MDEV-30806, MDEV-30972). * A GROUP BY query with MIN(primary_key) in select list and primary_key<>const in the WHERE could produce wrong result when executed with "Using index for group-by" strategy (MDEV-30605) * EXPLAIN could erroneously report that Rowid Filter optimization is used for partitioned tables. Partitioned tables do not support it. (MDEV-30596) * A bug in selectivity computations for SINGLE/DOUBLE_PREC_HB histograms could cause wrong estimates to be produced. This could cause the optimizer to pick sub-optimal query plans (MDEV-31067). Security * Fixes for the following security vulnerabilities: * CVE-2022-47015 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.2.1 pkgsrc/databases/mariadb106-client/Makefile cvs rdiff -u -r1.16 -r1.16.4.1 \ pkgsrc/databases/mariadb106-client/Makefile.common cvs rdiff -u -r1.6 -r1.6.4.1 pkgsrc/databases/mariadb106-client/PLIST cvs rdiff -u -r1.14 -r1.14.4.1 pkgsrc/databases/mariadb106-client/distinfo cvs rdiff -u -r1.25 -r1.25.2.1 pkgsrc/databases/mariadb106-server/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1688989745208110 Content-Disposition: inline Content-Length: 4341 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/mariadb106-client/Makefile diff -u pkgsrc/databases/mariadb106-client/Makefile:1.12 pkgsrc/databases/mariadb106-client/Makefile:1.12.2.1 --- pkgsrc/databases/mariadb106-client/Makefile:1.12 Wed Apr 19 08:09:25 2023 +++ pkgsrc/databases/mariadb106-client/Makefile Mon Jul 10 11:49:05 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2023/04/19 08:09:25 adam Exp $ +# $NetBSD: Makefile,v 1.12.2.1 2023/07/10 11:49:05 bsiegert Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 1 COMMENT= MariaDB 10.6, a free MySQL compatible database (client) CONFLICTS= mysql-client-[0-9]* Index: pkgsrc/databases/mariadb106-client/Makefile.common diff -u pkgsrc/databases/mariadb106-client/Makefile.common:1.16 pkgsrc/databases/mariadb106-client/Makefile.common:1.16.4.1 --- pkgsrc/databases/mariadb106-client/Makefile.common:1.16 Sat Mar 11 16:39:33 2023 +++ pkgsrc/databases/mariadb106-client/Makefile.common Mon Jul 10 11:49:05 2023 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.16 2023/03/11 16:39:33 nia Exp $ +# $NetBSD: Makefile.common,v 1.16.4.1 2023/07/10 11:49:05 bsiegert Exp $ # # used by databases/mariadb106-client/Makefile # used by databases/mariadb106-server/Makefile -DISTNAME= mariadb-10.6.12 +DISTNAME= mariadb-10.6.14 CATEGORIES= databases MASTER_SITES= https://archive.mariadb.org/${DISTNAME}/source/ Index: pkgsrc/databases/mariadb106-client/PLIST diff -u pkgsrc/databases/mariadb106-client/PLIST:1.6 pkgsrc/databases/mariadb106-client/PLIST:1.6.4.1 --- pkgsrc/databases/mariadb106-client/PLIST:1.6 Sat Mar 11 16:39:33 2023 +++ pkgsrc/databases/mariadb106-client/PLIST Mon Jul 10 11:49:05 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2023/03/11 16:39:33 nia Exp $ +@comment $NetBSD: PLIST,v 1.6.4.1 2023/07/10 11:49:05 bsiegert Exp $ bin/mariadb bin/mariadb-access bin/mariadb-admin @@ -51,6 +51,7 @@ include/mysql/mariadb_dyncol.h include/mysql/mariadb_rpl.h include/mysql/mariadb_stmt.h include/mysql/mariadb_version.h +include/mysql/my_alloca.h include/mysql/my_config.h include/mysql/my_global.h include/mysql/my_sys.h @@ -77,6 +78,7 @@ include/mysql/server/m_string.h include/mysql/server/ma_dyncol.h include/mysql/server/mariadb_capi_rename.h include/mysql/server/my_alloc.h +include/mysql/server/my_alloca.h include/mysql/server/my_attribute.h include/mysql/server/my_byteorder.h include/mysql/server/my_compiler.h Index: pkgsrc/databases/mariadb106-client/distinfo diff -u pkgsrc/databases/mariadb106-client/distinfo:1.14 pkgsrc/databases/mariadb106-client/distinfo:1.14.4.1 --- pkgsrc/databases/mariadb106-client/distinfo:1.14 Sat Mar 11 16:39:33 2023 +++ pkgsrc/databases/mariadb106-client/distinfo Mon Jul 10 11:49:05 2023 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.14 2023/03/11 16:39:33 nia Exp $ +$NetBSD: distinfo,v 1.14.4.1 2023/07/10 11:49:05 bsiegert Exp $ -BLAKE2s (mariadb-10.6.12.tar.gz) = 4a6c9dc5d716dd79d0f66134d46658d7d129e5872123ef744f9885c6e0968bb3 -SHA512 (mariadb-10.6.12.tar.gz) = f6d5178ce2a4d755367bb805f23e849824ee4c982a01a114c35a13d250a9b3b2a93ac9b745fb3685fd9e6b44deff0b5c936b43e5441d3af8a300881109db0549 -Size (mariadb-10.6.12.tar.gz) = 95085449 bytes +BLAKE2s (mariadb-10.6.14.tar.gz) = 9ae3d8d55d668156e40f6a1611200d9731f1869c1b9ad5d8c3e44774eecbe5a1 +SHA512 (mariadb-10.6.14.tar.gz) = 11b88480ac61303172e98ed3271c8172e840cded5175caba1469d6ec063df647b536ee6e95f110abd8d95d95c9b8d7edf1cb611113be225d5e8eeb2041f86438 +Size (mariadb-10.6.14.tar.gz) = 95286643 bytes SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f SHA1 (patch-CMakeLists.txt) = 042d9d361a5c3ff7e7df15f5de4a30eb7984cddd SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 Index: pkgsrc/databases/mariadb106-server/Makefile diff -u pkgsrc/databases/mariadb106-server/Makefile:1.25 pkgsrc/databases/mariadb106-server/Makefile:1.25.2.1 --- pkgsrc/databases/mariadb106-server/Makefile:1.25 Sun Apr 23 14:26:14 2023 +++ pkgsrc/databases/mariadb106-server/Makefile Mon Jul 10 11:49:05 2023 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.25 2023/04/23 14:26:14 adam Exp $ +# $NetBSD: Makefile,v 1.25.2.1 2023/07/10 11:49:05 bsiegert Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 2 COMMENT= MariaDB 10.6, a free MySQL compatible database (server) CONFLICTS= mysql-server-[0-9]* --_----------=_1688989745208110--