mariadb105*: Update to 10.5.11

This version of MariaDB is being released now to fix the following two regressions:

    Table alias from previous statement interferes later commands (MDEV-25672)
    Join using derived with aggregation returns incorrect results (MDEV-25714)

6 files changed, 8 insertions, 74 deletions

diff --git a/databases/mariadb105-client/Makefile b/databases/mariadb105-client/Makefile
index d4828be8da3..565702a6800 100644
--- a/databases/mariadb105-client/Makefile
+++ b/databases/mariadb105-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2021/05/24 19:49:29 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2021/07/24 10:10:03 nia Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MariaDB 10.5, a free MySQL compatible database (client)
 
 CONFLICTS=	mysql-client-[0-9]*
diff --git a/databases/mariadb105-client/Makefile.common b/databases/mariadb105-client/Makefile.common
index c0f5ae5cdea..003e8ed686f 100644
--- a/databases/mariadb105-client/Makefile.common
+++ b/databases/mariadb105-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2021/07/13 07:44:14 nia Exp $
+# $NetBSD: Makefile.common,v 1.9 2021/07/24 10:10:03 nia Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=	mariadb-10.5.10
+DISTNAME=	mariadb-10.5.11
 CATEGORIES=	databases
 MASTER_SITES=	https://downloads.mariadb.org/f/${DISTNAME}/source/
 MASTER_SITES+=	https://archive.mariadb.org/${DISTNAME}/source/
diff --git a/databases/mariadb105-client/distinfo b/databases/mariadb105-client/distinfo
index 881a005c6ca..cce0e6622ef 100644
--- a/databases/mariadb105-client/distinfo
+++ b/databases/mariadb105-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2021/07/03 09:23:45 nia Exp $
+$NetBSD: distinfo,v 1.3 2021/07/24 10:10:03 nia Exp $
 
-SHA1 (mariadb-10.5.10.tar.gz) = 7381ea990812be76b39688115f2cae40aa68b1d4
-RMD160 (mariadb-10.5.10.tar.gz) = 243fa6266f93d4a01c377b95704a3923b62eadce
-SHA512 (mariadb-10.5.10.tar.gz) = 93dd1405f8b31989e130dee5b7d4a0b447aa0e017fb9ee02c792c52142d84d1103e8fd591101d72deda1ac65b10c48053582f6e61bd1757e6aa92e42d98c56cd
-Size (mariadb-10.5.10.tar.gz) = 99019617 bytes
+SHA1 (mariadb-10.5.11.tar.gz) = f62668be013b1ab51ab7e001d026e17257ad8d30
+RMD160 (mariadb-10.5.11.tar.gz) = 9f0cbcfdc07c7015d4b054e40b08f93179aa3b0c
+SHA512 (mariadb-10.5.11.tar.gz) = 5ccb3f3d7cedf5ff79dd8d9304f0b7f3eb99a5558b446d1baf24cabe20c709360e2c99a737024793918fd6c23fc5a9bb83ffddfb5549310774d07294a3bbddf4
+Size (mariadb-10.5.11.tar.gz) = 99037098 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
@@ -11,15 +11,12 @@ SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a98288
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
 SHA1 (patch-mysys_crc32_crc32__arm64.c) = 0a479d4e9c6a186c631f3c0f99d15f633c8a484a
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
-SHA1 (patch-mysys_my__largepage.c) = d04a7a60f9cc6d70f30e454130ea0b76d7d98b3e
 SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
 SHA1 (patch-scripts_CMakeLists.txt) = b11f36e845716fccd455832b648f20413cd9de1f
 SHA1 (patch-scripts_mysql__install__db.sh) = adf20e80a9881db97f3d2dd8279e52bcedf0bead
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
-SHA1 (patch-sql_threadpool__generic.cc) = 2f5cf0a1d5e23696218d69698455e9181cccc629
 SHA1 (patch-storage_connect_ioapi.c) = 804e2d9d3722fbe4d5ed773cc98a4114fe4cf8a3
 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
-SHA1 (patch-storage_perfschema_my__thread.h) = a3bf42289017789d0fb62586dced32e283bd7ff4
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301
 SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12
diff --git a/databases/mariadb105-client/patches/patch-mysys_my__largepage.c b/databases/mariadb105-client/patches/patch-mysys_my__largepage.c
deleted file mode 100644
index df4bdbad4d5..00000000000
--- a/databases/mariadb105-client/patches/patch-mysys_my__largepage.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-mysys_my__largepage.c,v 1.1 2021/05/23 15:32:47 nia Exp $
-
-NetBSD does not have MAP_ALIGNED_SUPER.
-
---- mysys/my_largepage.c.orig	2021-05-05 21:00:19.000000000 +0000
-+++ mysys/my_largepage.c
-@@ -336,8 +336,12 @@ uchar *my_large_malloc(size_t *size, myf
- # warning "No explicit large page (HUGETLB pages) support in Linux < 3.8"
- #endif
- #elif defined(MAP_ALIGNED)
-+#ifdef MAP_ALIGNED_SUPER
-         mapflag|= MAP_ALIGNED_SUPER |
-                   MAP_ALIGNED(my_bit_log2_size_t(large_page_size));
-+#else
-+        mapflag|= MAP_ALIGNED(my_bit_log2_size_t(large_page_size));
-+#endif
- #endif
-         aligned_size= MY_ALIGN(*size, (size_t) large_page_size);
-       }
diff --git a/databases/mariadb105-client/patches/patch-sql_threadpool__generic.cc b/databases/mariadb105-client/patches/patch-sql_threadpool__generic.cc
deleted file mode 100644
index e2a750747c8..00000000000
--- a/databases/mariadb105-client/patches/patch-sql_threadpool__generic.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-sql_threadpool__generic.cc,v 1.1 2021/05/23 15:32:47 nia Exp $
-
-Deal with kqueue changes in NetBSD 10.
-
---- sql/threadpool_generic.cc.orig	2021-05-05 21:00:19.000000000 +0000
-+++ sql/threadpool_generic.cc
-@@ -240,7 +240,12 @@ static void *native_event_get_userdata(n
- */
- 
- #ifdef __NetBSD__
-+#include <sys/param.h>
-+#  if __NetBSD_Prereq__(9,99,17)
-+#define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, g)
-+#  else
- #define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, (intptr_t)g)
-+#  endif
- #else
- #define MY_EV_SET(a, b, c, d, e, f, g) EV_SET(a, b, c, d, e, f, g)
- #endif
diff --git a/databases/mariadb105-client/patches/patch-storage_perfschema_my__thread.h b/databases/mariadb105-client/patches/patch-storage_perfschema_my__thread.h
deleted file mode 100644
index 73f65969f2d..00000000000
--- a/databases/mariadb105-client/patches/patch-storage_perfschema_my__thread.h
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-storage_perfschema_my__thread.h,v 1.1 2021/05/23 15:32:47 nia Exp $
-
-Avoid type error on NetBSD.
-
---- storage/perfschema/my_thread.h.orig	2021-05-05 21:00:19.000000000 +0000
-+++ storage/perfschema/my_thread.h
-@@ -17,7 +17,7 @@
- typedef pthread_key_t thread_local_key_t;
- typedef pthread_t my_thread_handle;
- typedef pthread_attr_t my_thread_attr_t;
--typedef uint32 my_thread_os_id_t;
-+typedef intptr_t my_thread_os_id_t;
- 
- #define LOCK_plugin_delete LOCK_plugin
- 
-@@ -73,7 +73,7 @@ static inline my_thread_os_id_t my_threa
- #else
- #ifdef HAVE_INTEGER_PTHREAD_SELF
-   /* Unknown platform, fallback. */
--  return pthread_self();
-+  return (intptr_t)pthread_self();
- #else
-   /* Feature not available. */
-   return 0;