mariadb105: update to 10.5.18

                         MariaDB 10.5.18 Release Notes

Notable Items

  Backup

     * mariabackup --compress hangs (MDEV-29043)
     * Assertion on info.page_size failed in xb_delta_open_matching_space
       (MDEV-18589)

  InnoDB

     * InnoDB unnecessarily extends data files (MDEV-13013)
     * Adaptive hash index MDEV-27700, MDEV-29384
     * MVCC and locking MDEV-29666, MDEV-27927
     * Virtual columns MDEV-29299, MDEV-29753
     * InnoDB crash recovery fixes (MDEV-29438, MDEV-29475)
     * InnoDB crash recovery fixes (MDEV-29559)
     * MVCC and locking (MDEV-28709)
     * Race condition between KILL and transaction commit (MDEV-29368)

  Galera

     * Galera updated to 26.4.13
     * Galera server crashes after 10.3 > 10.4 upgrade (MDEV-29375)
     * wsrep_incoming_addresses status variable prints 0 as port number if
       the port is not mentioned in wsrep_node_incoming_address system
       variable (MDEV-28868)

  JSON

     * JSON_VALUE() does not parse NULL properties properly (MDEV-27151)

  Replication

     * minor correction in unsafe warning message (MDEV-28827)
     * False replication error-stop of REVOKE PRIVILEGES from a non-existing
       user on primary (MDEV-28530) in combination with a filtering replica
       is corrected
     * SET DEFAULT ROLE replication is mended on a replica that filters
       system tables (MDEV-28294)
     * XA COMMIT is not binlogged when the XA transaction has not updated any
       transaction engine (MDEV-25616)
     * Concurrent CREATE TRIGGER statements made to binlog without any mixup
       (MDEV-25606)

5 files changed, 10 insertions, 11 deletions

diff --git a/databases/mariadb105-client/Makefile b/databases/mariadb105-client/Makefile
index 7dd7b65c5c1..ea1a2fb2df9 100644
--- a/databases/mariadb105-client/Makefile
+++ b/databases/mariadb105-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2022/10/26 10:31:18 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2022/11/27 23:34:48 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 52587edc455..ddeea5f3347 100644
--- a/databases/mariadb105-client/Makefile.common
+++ b/databases/mariadb105-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.17 2022/09/23 08:28:05 nia Exp $
+# $NetBSD: Makefile.common,v 1.18 2022/11/27 23:34:48 nia Exp $
 #
 # used by databases/mariadb105-client/Makefile
 # used by databases/mariadb105-server/Makefile
 
-DISTNAME=	mariadb-10.5.17
+DISTNAME=	mariadb-10.5.18
 CATEGORIES=	databases
 MASTER_SITES=	https://archive.mariadb.org/${DISTNAME}/source/
 
diff --git a/databases/mariadb105-client/PLIST b/databases/mariadb105-client/PLIST
index 37f3ca5770d..ac3c9b8131a 100644
--- a/databases/mariadb105-client/PLIST
+++ b/databases/mariadb105-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2022/02/19 09:57:51 nia Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/11/27 23:34:48 nia Exp $
 bin/mariadb
 bin/mariadb-access
 bin/mariadb-admin
@@ -163,6 +163,7 @@ include/mysql/server/private/heap.h
 include/mysql/server/private/ilist.h
 include/mysql/server/private/lf.h
 include/mysql/server/private/maria.h
+include/mysql/server/private/mariadb_capi_rename.h
 include/mysql/server/private/my_alarm.h
 include/mysql/server/private/my_atomic.h
 include/mysql/server/private/my_atomic_wrapper.h
diff --git a/databases/mariadb105-client/distinfo b/databases/mariadb105-client/distinfo
index 2e66bd399d0..5a69e0b4966 100644
--- a/databases/mariadb105-client/distinfo
+++ b/databases/mariadb105-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.15 2022/10/25 19:03:26 jperkin Exp $
+$NetBSD: distinfo,v 1.16 2022/11/27 23:34:48 nia Exp $
 
-BLAKE2s (mariadb-10.5.17.tar.gz) = e2b29683aa1e6ff33bb3ef1e16fabd4c0611d517688225cd72b630c4390e2d39
-SHA512 (mariadb-10.5.17.tar.gz) = 5a68126aac7072bed549404c89f7215bc47dede8f72559076988469372b96523a800fd6bbf11ff3003a277ee30788ca99a21507b7d7e2b7e98437ca70b5ca0fc
-Size (mariadb-10.5.17.tar.gz) = 113314849 bytes
+BLAKE2s (mariadb-10.5.18.tar.gz) = fed6b47a5fa140311a20a0c1f87ff04713dcfd51939dc71defed248755160c41
+SHA512 (mariadb-10.5.18.tar.gz) = 1fe13db1c0b66d2bc0c4d80e2c278f6e64027aaeebebfa5a179bd8ca92ae135ae53b72ed26c9b6d35b35fd2ad2a3cb390fd5ee0715b22d4bfafe773f950d804c
+Size (mariadb-10.5.18.tar.gz) = 111568643 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
 SHA1 (patch-CMakeLists.txt) = 574131db46854715758c60ba5f026498f5b29564
 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index 5f70e066151..87e044dfa81 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2022/11/23 16:19:35 adam Exp $
+# $NetBSD: Makefile,v 1.30 2022/11/27 23:34:48 nia Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	2
 COMMENT=	MariaDB 10.5, a free MySQL compatible database (server)
 
 CONFLICTS=	mysql-server-[0-9]*