CVS commit: pkgsrc/databases

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Aug 17 00:19:22 UTC 2024

Modified Files:
        pkgsrc/databases/mariadb1011-client: Makefile Makefile.common distinfo
        pkgsrc/databases/mariadb1011-client/patches: patch-sql_mysqld.cc
        pkgsrc/databases/mariadb1011-embedded: Makefile
        pkgsrc/databases/mariadb1011-server: Makefile PLIST
Removed Files:
        pkgsrc/databases/mariadb1011-client/patches: patch-sql_item__strfunc.cc

Log Message:
mariadb1011-*: Update to 10.11.9

                         MariaDB 10.11.9 Release Notes

Notable Items

  Storage Engines

    InnoDB

     * We fail to terminate transaction early with ER_LOCK_TABLE_FULL when
       lock memory is growing (MDEV-34167)
     * Alter operation on redundant table aborts the server (MDEV-34222)
     * MariaDB crashes with SIGILL because the OS does not support AVX512
       (MDEV-34565)
     * InnoDB: Failing assertion: stat_n_leaf_pages > 0 in
       ha_innobase::estimate_rows_upper_bound (MDEV-34474)
     * wait_for_read in buf_page_get_low hurts performance (MDEV-34458)
     * InnoDB: Assertion failure in file ./storage/innobase/page/page0zip.cc
       line 4211 (MDEV-34357)

    Aria

     * Index for (specific) Aria table is created as corrupted (MDEV-34522)

    Spider

     * UBSAN: runtime error: applying non-zero offset in spider_free_mem and
       SIGSEGV in spider_free_mem on SELECT (MDEV-31475)
     * SIGSEGV in ha_resolve_storage_engine_name, UBSAN: runtime error: index
       4294967295 out of bounds for type 'st_plugin_int *[64]' (MDEV-32487)
     * SIGSEGV in spider_db_conn::fin_loop_check, and ASAN:
       heap-use-after-free in spider_db_mbase::fin_loop_check on SHOW TABLE
       STATUS (MDEV-34541)
     * SIGSEGV in ha_spider::lock_tables on BEGIN after table lock
       (MDEV-29962)
     * SIGSEGV in spider_conn_first_link_idx and others on DELETE, INSERT and
       SELECT (MDEV-32492)
     * Spider: Crashes, asserts, hangs, memory corruptions and ASAN
       heap-use-after-free's (MDEV-27902)
     * Spider: @@insert_id 128 to TINYINT: Assertion `!is_set() || (m_status
       == DA_OK_BULK && is_bulk_op())' failed. (MDEV-28105)
     * ASAN errors in spider_db_free_result after partition DDL (MDEV-29027)
     * Server crashes when calling spider UDF after aria_encrypt_tables is
       enabled (MDEV-34682)

  Partitioning

     * MariaDB Server crashes with ill-formed partitions (MDEV-32155)
     * SIGSEGV in parse_engine_part_options on INSERT, SELECT or ALTER
       (MDEV-34421)
     * Assertion `auto_increment_value' failed in ha_partition::info on
       INSERT into MEMORY table (MDEV-24610)

  Character Sets

     * On startup: UBSAN: applying zero offset to null pointer in
       my_copy_fix_mb from strings/ctype-mb.c and other locations
       (MDEV-34226)
     * On startup: UBSAN: runtime error: applying zero offset to null pointer
       in skip_trailing_space and
       my_hash_sort_utf8mb3_general1400_nopad_as_ci (MDEV-34187)
     * SHOW CREATE DATABASE statement crashes the server when db name
       contains some unicode characters, ASAN stack-buffer-overflow
       (MDEV-32376)
     * Wrong result set with utf8mb4_danish_ci and BNLH join (MDEV-34417)

  Optimizer

     * On startup: UBSAN: runtime error: applying non-zero offset in
       JOIN::make_aggr_tables_info in sql/sql_select.cc (MDEV-34227)
     * Crash after killing query while it is processed by test_quick_select
       (MDEV-30651)
     * Extend condition normalization to include 'NOT a' (MDEV-19520)
     * Constant subquery causing a crash in pushdown optimization
       (MDEV-29363)
     * Crash when pushing condition with CHARSET()/COERCIBILITY() into
       derived table (MDEV-33010)
     * 2nd execution name resolution problem with pushdown into unions
       (MDEV-34506)
     * Assertion `(key_part->key_part_flag & 4) == 0' failed key_hashnr
       (MDEV-34580)
     * Crash caused by query containing constant having clause (MDEV-23983)
     * Using NAME_CONST() (or executing query from the stored procedure and
       referring to a local variable) changes the plan and may make execution
       slower (MDEV-33971)
     * ORDER BY DESC causes ROWID Filter optimization performance degradation
       (MDEV-33875)

  Replication

     * Auto-generated DELETE from HEAP table can break replication
       (MDEV-25607)
     * Replication fails when XA transactions are used where the slave has
       replicate_do_db set and the client has touched a different database
       when running DML such as inserts. (MDEV-33921)
     * replication master password length (MDEV-23857)
     * an option to enable semisync recovery (MDEV-33465)

  Backup

     * Hide password passed on commandline from xtrabackup_info (MDEV-34434)

  Galera

     * Galera updated to 26.4.19
     * galera_gtid_2_cluster: Assertion `thd->wsrep_next_trx_id() !=
       (0x7fffffffffffffffLL * 2ULL + 1)' (MDEV-32633)
     * table gtid_slave_pos entries never been deleted with wsrep_gtid_mode =
       0 (MDEV-34170)
     * Deadlock found when trying to get lock during applying (MDEV-31658)
     * Change error code for Galera unkillable threads (MDEV-12008)
     * 10.11.8 cluster becomes inconsistent when using composite primary key
       and partitioning (MDEV-34269)
     * wsrep_sst_mariabackup use /tmp dir during SST rather then user defined
       tmpdir (MDEV-32158)

  General

     * As per the MariaDB Deprecation Policy, this will be the last release
       of MariaDB 10.11 for Debian 10 "Buster", RHEL/CentOS 7, Ubuntu 23.10
       "Mantic", and Fedora 38
     * Repositories for Ubuntu 24.04 "Noble" have been added
     * IMPORT TABLESPACE unnecessarily traverses tablespaces list
       (MDEV-34670)
     * unknown variable defaults-group-suffix= with
       mariadb-secure-installation (MDEV-33265)
     * mariadb-install-db appears to hang on macOS (MDEV-34129)
     * We fail to terminate transaction early with ER_LOCK_TABLE_FULL when
       lock memory is growing (MDEV-34167)
     * Disable new connections in case of fatal signal (MDEV-34475)
     * Control over memory allocated for SP/PS (MDEV-14959)
     * Trigger doesn't work correctly with bulk insert (MDEV-24411)
     * Assertion `table->field[0]->ptr >= table->record[0] &&
       table->field[0]->ptr <= table->record[0] + table->s->reclength' failed
       in void handler::assert_icp_limitations(uchar*) (MDEV-34632)
     * Sandbox mode \- is not compatible with --binary-mode (MDEV-34203)


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/databases/mariadb1011-client/Makefile
cvs rdiff -u -r1.13 -r1.14 \
    pkgsrc/databases/mariadb1011-client/Makefile.common
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/mariadb1011-client/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mariadb1011-client/patches/patch-sql_item__strfunc.cc
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mariadb1011-embedded/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mariadb1011-server/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mariadb1011-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/mariadb1011-client/Makefile
diff -u pkgsrc/databases/mariadb1011-client/Makefile:1.10 pkgsrc/databases/mariadb1011-client/Makefile:1.11
--- pkgsrc/databases/mariadb1011-client/Makefile:1.10   Tue Jul 16 10:02:00 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile        Sat Aug 17 00:19:21 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2024/07/16 10:02:00 prlw1 Exp $
+# $NetBSD: Makefile,v 1.11 2024/08/17 00:19:21 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   2
 COMMENT=       MariaDB 10.11, a free MySQL compatible database (client)
 
 CONFLICTS=     mysql-client-[0-9]*
@@ -9,6 +8,7 @@ CONFLICTS=      mysql-client-[0-9]*
 .include "Makefile.common"
 
 CMAKE_ARGS+=   -DWITHOUT_SERVER=ON
+CMAKE_ARGS+=   -DWITH_WSREP=OFF
 CMAKE_ARGS+=   -DWITH_LIBFMT=system
 
 INSTALL_DIRS+= client include libmariadb man scripts

Index: pkgsrc/databases/mariadb1011-client/Makefile.common
diff -u pkgsrc/databases/mariadb1011-client/Makefile.common:1.13 pkgsrc/databases/mariadb1011-client/Makefile.common:1.14
--- pkgsrc/databases/mariadb1011-client/Makefile.common:1.13    Mon Jul 22 19:26:30 2024
+++ pkgsrc/databases/mariadb1011-client/Makefile.common Sat Aug 17 00:19:21 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.13 2024/07/22 19:26:30 adam Exp $
+# $NetBSD: Makefile.common,v 1.14 2024/08/17 00:19:21 nia Exp $
 #
 # used by databases/mariadb1011-client/Makefile
 # used by databases/mariadb1011-server/Makefile
 # used by databases/mariadb1011-embedded/Makefile
 
-DISTNAME=      mariadb-10.11.8
+DISTNAME=      mariadb-10.11.9
 CATEGORIES=    databases
 MASTER_SITES=  https://archive.mariadb.org/${DISTNAME}/source/
 

Index: pkgsrc/databases/mariadb1011-client/distinfo
diff -u pkgsrc/databases/mariadb1011-client/distinfo:1.9 pkgsrc/databases/mariadb1011-client/distinfo:1.10
--- pkgsrc/databases/mariadb1011-client/distinfo:1.9    Mon Jul 22 19:26:30 2024
+++ pkgsrc/databases/mariadb1011-client/distinfo        Sat Aug 17 00:19:21 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2024/07/22 19:26:30 adam Exp $
+$NetBSD: distinfo,v 1.10 2024/08/17 00:19:21 nia Exp $
 
-BLAKE2s (mariadb-10.11.8.tar.gz) = 786329da47785061212e877e1e0cc56451f155f48c61de743b15b7afa8a52dc3
-SHA512 (mariadb-10.11.8.tar.gz) = 61bdbe4a51adb438335c22bfcf75f59864fa0412c7ed6e938ef73fd602c2ef27131dbeef83cd314f2bea54135c6e8f8646608ff96a7ce6ce2c74f34ef6a8675f
-Size (mariadb-10.11.8.tar.gz) = 100913048 bytes
+BLAKE2s (mariadb-10.11.9.tar.gz) = 5505429a897f1b821a18ad1e303f9f81ee766a2c31da36c7ce012fe4041094d1
+SHA512 (mariadb-10.11.9.tar.gz) = a51680babed106ad52a8a9d57fb1db82fca02fd3eff7ef3f2cc3dd89bd9608e9f78ca5a11335a6be8d22950ca8caf1e859bd19550ab3fe129b73b856674cfdc0
+Size (mariadb-10.11.9.tar.gz) = 101611566 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = b41fc869c3ebf0b13138a566a03080a0f3475551
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
@@ -16,8 +16,7 @@ SHA1 (patch-plugin_auth__gssapi_cmake_Fi
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
 SHA1 (patch-scripts_CMakeLists.txt) = b8a13304e314162ab0a1fc06c5620d6b757975f5
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
-SHA1 (patch-sql_item__strfunc.cc) = d540ac075612cf9d9fc8294602009c6042328808
-SHA1 (patch-sql_mysqld.cc) = 71400987a62be294842694cbc59c446bef578202
+SHA1 (patch-sql_mysqld.cc) = f7704b39ae5101b46289692f346a6f17ba5e219c
 SHA1 (patch-storage_innobase_include_transactional__lock__guard.h) = d5ff507acdd21858791246ef5a2559e653cb7833
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301

Index: pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc
diff -u pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc:1.2 pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc:1.3
--- pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc:1.2 Thu Jun 20 16:52:29 2024
+++ pkgsrc/databases/mariadb1011-client/patches/patch-sql_mysqld.cc     Sat Aug 17 00:19:21 2024
@@ -1,14 +1,11 @@
-$NetBSD: patch-sql_mysqld.cc,v 1.2 2024/06/20 16:52:29 abs Exp $
+$NetBSD: patch-sql_mysqld.cc,v 1.3 2024/08/17 00:19:21 nia Exp $
 
 Add missing declaration of "concurrency".
 Fixes build on illumos. From OmniOS CE.
 
-Apply https://github.com/MariaDB/server/pull/3253 to avoid
-hang on exit on at least NetBSD (and presumably macOS)
-
---- sql/mysqld.cc.orig 2024-06-20 16:21:36.964589822 +0000
+--- sql/mysqld.cc.orig 2024-08-03 07:29:59.000000000 +0000
 +++ sql/mysqld.cc
-@@ -453,7 +453,7 @@ Atomic_counter<uint32_t> THD_count::coun
+@@ -455,7 +455,7 @@ Atomic_counter<uint32_t> THD_count::coun
  bool shutdown_wait_for_slaves;
  Atomic_counter<uint32_t> slave_open_temp_tables;
  ulong thread_created;
@@ -17,39 +14,3 @@ hang on exit on at least NetBSD (and pre
  ulong what_to_log;
  ulong slow_launch_time;
  ulong open_files_limit, max_binlog_size;
-@@ -3205,6 +3205,15 @@ static void start_signal_handler(void)
-   DBUG_VOID_RETURN;
- }
- 
-+/** Called only from signal_hand function. */
-+static void* exit_signal_handler()
-+{
-+    my_thread_end();
-+    signal_thread_in_use= 0;
-+    pthread_exit(0);  // Safety
-+    return nullptr;  // Avoid compiler warnings
-+}
-+
- 
- /** This threads handles all signals and alarms. */
- /* ARGSUSED */
-@@ -3265,10 +3274,7 @@ pthread_handler_t signal_hand(void *arg 
-     if (abort_loop)
-     {
-       DBUG_PRINT("quit",("signal_handler: calling my_thread_end()"));
--      my_thread_end();
--      signal_thread_in_use= 0;
--      pthread_exit(0);                                // Safety
--      return 0;                                 // Avoid compiler warnings
-+      return exit_signal_handler();
-     }
-     switch (sig) {
-     case SIGTERM:
-@@ -3287,6 +3293,7 @@ pthread_handler_t signal_hand(void *arg 
-         PSI_CALL_delete_current_thread();
-         my_sigset(sig, SIG_IGN);
-         break_connect_loop(); // MIT THREAD has a alarm thread
-+        return exit_signal_handler();
-       }
-       break;
-     case SIGHUP:

Index: pkgsrc/databases/mariadb1011-embedded/Makefile
diff -u pkgsrc/databases/mariadb1011-embedded/Makefile:1.6 pkgsrc/databases/mariadb1011-embedded/Makefile:1.7
--- pkgsrc/databases/mariadb1011-embedded/Makefile:1.6  Mon Jul 22 19:28:04 2024
+++ pkgsrc/databases/mariadb1011-embedded/Makefile      Sat Aug 17 00:19:21 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2024/07/22 19:28:04 adam Exp $
+# $NetBSD: Makefile,v 1.7 2024/08/17 00:19:21 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-embedded-/}
-PKGREVISION=   4
 COMMENT=       MariaDB 10.11, a free MySQL compatible database (embedded)
 
 # for the header files needed by the installed header file of this package
@@ -125,6 +124,7 @@ post-install:
                include/mysql/server/private/lex.h \
                include/mysql/server/private/lex_charset.h \
                include/mysql/server/private/lex_hash.h \
+               include/mysql/server/private/lex_ident.h \
                include/mysql/server/private/lex_string.h \
                include/mysql/server/private/lex_symbol.h \
                include/mysql/server/private/lex_token.h \

Index: pkgsrc/databases/mariadb1011-server/Makefile
diff -u pkgsrc/databases/mariadb1011-server/Makefile:1.12 pkgsrc/databases/mariadb1011-server/Makefile:1.13
--- pkgsrc/databases/mariadb1011-server/Makefile:1.12   Wed Jul 31 20:44:43 2024
+++ pkgsrc/databases/mariadb1011-server/Makefile        Sat Aug 17 00:19:22 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2024/07/31 20:44:43 markd Exp $
+# $NetBSD: Makefile,v 1.13 2024/08/17 00:19:22 nia Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   4
 COMMENT=       MariaDB 10.11, a free MySQL compatible database (server)
 
 CONFLICTS=     mysql-server-[0-9]*

Index: pkgsrc/databases/mariadb1011-server/PLIST
diff -u pkgsrc/databases/mariadb1011-server/PLIST:1.3 pkgsrc/databases/mariadb1011-server/PLIST:1.4
--- pkgsrc/databases/mariadb1011-server/PLIST:1.3       Wed Apr 10 19:24:05 2024
+++ pkgsrc/databases/mariadb1011-server/PLIST   Sat Aug 17 00:19:22 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2024/04/10 19:24:05 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/08/17 00:19:22 nia Exp $
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump
@@ -112,6 +112,7 @@ include/mysql/server/private/keycaches.h
 include/mysql/server/private/lex.h
 include/mysql/server/private/lex_charset.h
 include/mysql/server/private/lex_hash.h
+include/mysql/server/private/lex_ident.h
 include/mysql/server/private/lex_string.h
 include/mysql/server/private/lex_symbol.h
 include/mysql/server/private/lex_token.h