mariadb106: update to 10.6.4

Notable Items

  InnoDB

     * InnoDB no longer acquires advisory file locks by default (MDEV-24393)
     * Encryption: Automatically disable key rotation checks for
       file_key_management plugin (MDEV-14180)
     * Some fixes from MySQL 5.7.35 (MDEV-26205)
     * Fixed scrubbing on AIX (MDEV-26110)
     * buf_pool.flush_list corrupted by buffer pool resizing or
       ROW_FORMAT=COMPRESSED (MDEV-26200)

  Optimizer

     * A query that uses ORDER BY .. LIMIT clause and "Range checked for each
       record optimization" could produce incorrect results under some
       circumstances (MDEV-25858)
     * Queries that have more than 32 equality conditions comparing columns
       of different tables ("tableX.colX=tableY.colY) could cause a stack
       overrun in the query optimizer (MDEV-17783, MDEV-23937)
     * "Condition pushdown into derived table" optimization cannot be applied
       if the expression being pushed refers to a derived table column which
       is computed from expression that has a stored function call, @session
       variable reference, or other similar construct. The fix for MDEV-25969
       makes it so that only the problematic part of the condition is not
       pushed. The rest of the condition is now pushed. (MDEV-25969)
     * A query with window function on the left side of the subquery could
       cause a crash. (MDEV-25630)
     * Fixed the issue fixed in MySQL Bug #76803: DML or locking SELECT
       statements that use outer joins could produce this warning in the
       error log: [ERROR] InnoDB: Unlock row could not find a 3 mode lock on
       the record. (MDEV-26106)

  Security

     * Fixes for the following security vulnerabilities:
          * CVE-2021-2372
          * CVE-2021-2389

4 files changed, 24 insertions, 39 deletions

diff --git a/databases/mariadb106-client/Makefile.common b/databases/mariadb106-client/Makefile.common
index bad719d982b..2630dc085bb 100644
--- a/databases/mariadb106-client/Makefile.common
+++ b/databases/mariadb106-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2021/08/05 11:21:23 nia Exp $
+# $NetBSD: Makefile.common,v 1.4 2021/08/07 08:55:50 nia Exp $
 #
 # used by databases/mariadb106-client/Makefile
 # used by databases/mariadb106-server/Makefile
 
-DISTNAME=	mariadb-10.6.3
+DISTNAME=	mariadb-10.6.4
 CATEGORIES=	databases
 MASTER_SITES=	https://downloads.mariadb.org/f/${DISTNAME}/source/
 MASTER_SITES+=	https://archive.mariadb.org/${DISTNAME}/source/
diff --git a/databases/mariadb106-client/distinfo b/databases/mariadb106-client/distinfo
index 378c993ab2f..fd7065c5b72 100644
--- a/databases/mariadb106-client/distinfo
+++ b/databases/mariadb106-client/distinfo
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.1 2021/08/04 15:47:24 nia Exp $
+$NetBSD: distinfo,v 1.2 2021/08/07 08:55:50 nia Exp $
 
-SHA1 (mariadb-10.6.3.tar.gz) = 4705158074b49fd05096e7eec6d452c3105a5c3b
-RMD160 (mariadb-10.6.3.tar.gz) = 1e91466c4afeb3950fe5ed303f79d7a3d99e3c57
-SHA512 (mariadb-10.6.3.tar.gz) = 2799de07b0c7d166a6a6530775f7ffcb0561715f5a61874f5c43c2866c5c409683c6442cb45f989bff37dc23690239df7f14a3c16e0d5ac0543e01398411cac2
-Size (mariadb-10.6.3.tar.gz) = 82053322 bytes
+SHA1 (mariadb-10.6.4.tar.gz) = d955487a1bfd5e1478e607d6077130d50ca817d0
+RMD160 (mariadb-10.6.4.tar.gz) = 11277c51648b2a85e6c8433b5aaa3b05e3f3efa5
+SHA512 (mariadb-10.6.4.tar.gz) = c216244ce126e6f8954303a76078dc12146e8ea941041edd215dc05201adda1d5158cd7f1c9831328f783aba4f884965ae288f33bbc43229bc6224a4f1079071
+Size (mariadb-10.6.4.tar.gz) = 84947143 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
-SHA1 (patch-mysys_crc32_crc32__arm64.c) = 0a479d4e9c6a186c631f3c0f99d15f633c8a484a
 SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
 SHA1 (patch-plugin_auth__socket_CMakeLists.txt) = b2fddab1d94ba75c69cbf660f546f8e5821e1d51
 SHA1 (patch-plugin_auth__socket_auth__socket.c) = 094d49d8302be8e7111b6eddd3b6462a553cc22a
 SHA1 (patch-scripts_CMakeLists.txt) = e58c21db8fe03f85c496bbdc04c8e30f4a7a7f24
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
+SHA1 (patch-sql_mysqld.cc) = 19d325124cde1b45376c9710cdd104dc460f4bea
 SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3
 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
diff --git a/databases/mariadb106-client/patches/patch-mysys_crc32_crc32__arm64.c b/databases/mariadb106-client/patches/patch-mysys_crc32_crc32__arm64.c
deleted file mode 100644
index 6d283cf647e..00000000000
--- a/databases/mariadb106-client/patches/patch-mysys_crc32_crc32__arm64.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-mysys_crc32_crc32__arm64.c,v 1.1 2021/08/04 15:47:24 nia Exp $
-
-Fix building on NetBSD/aarch64.
-
---- mysys/crc32/crc32_arm64.c.orig	2021-05-05 21:00:19.000000000 +0000
-+++ mysys/crc32/crc32_arm64.c
-@@ -2,13 +2,13 @@
- #include <string.h>
- #include <stdint.h>
- 
-+static int pmull_supported;
-+
- #if defined(HAVE_ARMV8_CRC)
- 
- #if defined(__APPLE__)
- #include <sys/sysctl.h>
- 
--static int pmull_supported;
--
- int crc32_aarch64_available(void)
- {
-   int ret;
-@@ -48,8 +48,6 @@ static unsigned long getauxval(unsigned 
- # define HWCAP_PMULL (1 << 4)
- #endif
- 
--static int pmull_supported;
--
- /* ARM made crc32 default from ARMv8.1 but optional in ARMv8A
-  * Runtime check API.
-  */
diff --git a/databases/mariadb106-client/patches/patch-sql_mysqld.cc b/databases/mariadb106-client/patches/patch-sql_mysqld.cc
new file mode 100644
index 00000000000..0a5b6e38bd6
--- /dev/null
+++ b/databases/mariadb106-client/patches/patch-sql_mysqld.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-sql_mysqld.cc,v 1.1 2021/08/07 08:55:50 nia Exp $
+
+Add missing declaration of "concurrency".
+Fixes build on illumos. From OmniOS CE.
+
+--- sql/mysqld.cc.orig	2021-08-03 14:48:41.000000000 +0000
++++ sql/mysqld.cc
+@@ -443,7 +443,7 @@ Atomic_counter<uint32_t> THD_count::coun
+ bool shutdown_wait_for_slaves;
+ Atomic_counter<uint32_t> slave_open_temp_tables;
+ ulong thread_created;
+-ulong back_log, connect_timeout, server_id;
++ulong back_log, connect_timeout, concurrency, server_id;
+ ulong what_to_log;
+ ulong slow_launch_time;
+ ulong open_files_limit, max_binlog_size;