$ git diff --patch-with-stat --summary 5d0338eda5fab5250111ce567cd6081bf07c4ec7..3548001cc49831e952caa12b21ee508e502aab53

 .abf.yml                        |  2 +-
 .onedev-buildspec.yml           |  4 ++++
 87309d3d4.patch                 | 27 ++++++++++++++++++++++
 mariadb-11.7.2-compile.patch    | 22 ++++++++++++++++++
 mariadb-fix-fmt-detection.patch | 18 +++++++++++++++
 mariadb-omv-paths.patch         | 21 +++++++++++++++++
 mariadb.spec                    | 51 ++++++++++++++++++++++++++++++-----------
 mysql.service.in                | 11 +++++++++
 mysql@.service.in               | 11 +++++++++
 9 files changed, 153 insertions(+), 14 deletions(-)
 create mode 100644 .onedev-buildspec.yml
 create mode 100644 87309d3d4.patch
 create mode 100644 mariadb-11.7.2-compile.patch
 create mode 100644 mariadb-fix-fmt-detection.patch
 create mode 100644 mariadb-omv-paths.patch

diff --git a/.abf.yml b/.abf.yml
index ffe3094..61b8930 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  mariadb-11.2.4.tar.gz: 2e46154b7453272451433a3f070679dc4ba984a4
+  mariadb-12.2.2.tar.gz: 68b66e0810b93e31f2ffdb391187981a772cd605
diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
new file mode 100644
index 0000000..b95f83a
--- /dev/null
+++ b/.onedev-buildspec.yml
@@ -0,0 +1,4 @@
+version: 40
+imports:
+- projectPath: OpenMandriva/Packages
+  revision: mirroring
diff --git a/87309d3d4.patch b/87309d3d4.patch
new file mode 100644
index 0000000..f688d27
--- /dev/null
+++ b/87309d3d4.patch
@@ -0,0 +1,27 @@
+From 87309d3d4bb8f48910d05b0ca5ee989bcdd6b053 Mon Sep 17 00:00:00 2001
+From: Sergei Golubchik <serg@mariadb.org>
+Date: Fri, 13 Feb 2026 15:22:57 +0100
+Subject: [PATCH] MDEV-38811 crash in information_schema.table_constraints when
+ --skip-grant-tables
+
+acl_get_all3() wasn't expecting --skip-grant-tables
+---
+ mysql-test/main/skip_grants.result | 40 +++++++++++++++++++++++++++++-
+ mysql-test/main/skip_grants.test   |  8 +++++-
+ sql/sql_acl.cc                     |  3 +++
+ 3 files changed, 49 insertions(+), 2 deletions(-)
+
+diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
+index 30ad5d6f40294..d7910024cb15a 100644
+--- a/sql/sql_acl.cc
++++ b/sql/sql_acl.cc
+@@ -3875,6 +3875,9 @@ privilege_t acl_get(const char *host, const char *ip,
+ privilege_t acl_get_all3(Security_context *sctx, const char *db,
+                          bool db_is_patern)
+ {
++  if (!initialized)
++    return DB_ACLS;
++
+   privilege_t access= acl_get(sctx->host, sctx->ip,
+                               sctx->priv_user, db, db_is_patern);
+   if (sctx->priv_role[0])
diff --git a/mariadb-11.7.2-compile.patch b/mariadb-11.7.2-compile.patch
new file mode 100644
index 0000000..9d34512
--- /dev/null
+++ b/mariadb-11.7.2-compile.patch
@@ -0,0 +1,22 @@
+diff -up mariadb-11.7.2/storage/innobase/include/trx0trx.h.omv~ mariadb-11.7.2/storage/innobase/include/trx0trx.h
+--- mariadb-11.7.2/storage/innobase/include/trx0trx.h.omv~	2025-04-19 15:37:26.798341291 +0200
++++ mariadb-11.7.2/storage/innobase/include/trx0trx.h	2025-04-19 15:38:24.183688439 +0200
+@@ -671,14 +671,18 @@ public:
+   {
+     ut_ad(!mutex_is_owner());
+     mutex.wr_lock();
++#ifdef UNIV_DEBUG
+     assert(!mutex_owner.exchange(pthread_self(),
+                                  std::memory_order_relaxed));
++#endif
+   }
+   /** Release the mutex */
+   void mutex_unlock()
+   {
++#ifdef UNIV_DEBUG
+     assert(mutex_owner.exchange(0, std::memory_order_relaxed) ==
+            pthread_self());
++#endif
+     mutex.wr_unlock();
+   }
+ #ifndef SUX_LOCK_GENERIC
diff --git a/mariadb-fix-fmt-detection.patch b/mariadb-fix-fmt-detection.patch
new file mode 100644
index 0000000..f1bbdb2
--- /dev/null
+++ b/mariadb-fix-fmt-detection.patch
@@ -0,0 +1,18 @@
+diff -up mariadb-11.7.2/cmake/libfmt.cmake.omv~ mariadb-11.7.2/cmake/libfmt.cmake
+--- mariadb-11.7.2/cmake/libfmt.cmake.omv~	2025-04-19 16:52:03.912500486 +0200
++++ mariadb-11.7.2/cmake/libfmt.cmake	2025-04-19 16:52:38.032768615 +0200
+@@ -31,12 +31,13 @@ MACRO (CHECK_LIBFMT)
+     "#define FMT_STATIC_THOUSANDS_SEPARATOR ','
+      #define FMT_HEADER_ONLY 1
+      #include <fmt/args.h>
++     #include <locale>
+      int main() {
+        using ArgStore= fmt::dynamic_format_arg_store<fmt::format_context>;
+        ArgStore arg_store;
+        int answer= 4321;
+        arg_store.push_back(answer);
+-       return fmt::vformat(\"{:L}\", arg_store).compare(\"4,321\");
++       return fmt::vformat(std::locale(\"en_US.UTF-8\"), \"{:L}\", arg_store).compare(\"4,321\");
+      }" HAVE_SYSTEM_LIBFMT)
+     SET(CMAKE_REQUIRED_INCLUDES)
+   ENDIF()
diff --git a/mariadb-omv-paths.patch b/mariadb-omv-paths.patch
new file mode 100644
index 0000000..ee67a39
--- /dev/null
+++ b/mariadb-omv-paths.patch
@@ -0,0 +1,21 @@
+diff -up mariadb-12.2.2/cmake/install_layout.cmake.omv~ mariadb-12.2.2/cmake/install_layout.cmake
+--- mariadb-12.2.2/cmake/install_layout.cmake.omv~	2026-02-18 17:05:58.258583976 +0100
++++ mariadb-12.2.2/cmake/install_layout.cmake	2026-02-18 17:10:49.512454172 +0100
+@@ -157,13 +157,13 @@ SET(INSTALL_MYSQLTESTDIR_RPM
+ SET(INSTALL_SQLBENCHDIR_RPM             "")
+-SET(INSTALL_SUPPORTFILESDIR_RPM         "share/mariadb")
++SET(INSTALL_SUPPORTFILESDIR_RPM         "share/mysql")
+ #
+-SET(INSTALL_MYSQLDATADIR_RPM            "/var/lib/mysql")
++SET(INSTALL_MYSQLDATADIR_RPM            "/srv/mysql")
+ 
+-SET(INSTALL_UNIX_ADDRDIR_RPM            "${INSTALL_MYSQLDATADIR_RPM}/mysql.sock")
+ SET(INSTALL_SYSTEMD_UNITDIR_RPM         "/usr/lib/systemd/system")
+ SET(INSTALL_SYSTEMD_SYSUSERSDIR_RPM     "/usr/lib/sysusers.d")
+ SET(INSTALL_SYSTEMD_TMPFILESDIR_RPM     "/usr/lib/tmpfiles.d")
+-SET(INSTALL_RUNDATADIR_RPM              "/run/mariadb")
++SET(INSTALL_RUNDATADIR_RPM              "/run/mysqld")
++SET(INSTALL_UNIX_ADDRDIR_RPM            "${INSTALL_RUNDATADIR_RPM}/mysql.sock")
+ SET(INSTALL_PAMDIR_RPM                  "/${INSTALL_LIBDIR_RPM}/security")
+ SET(INSTALL_PAMDATADIR_RPM              "/etc/security")
+ 
diff --git a/mariadb.spec b/mariadb.spec
index a246699..fd74c89 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -12,24 +12,27 @@
 
 Summary:	The MariaDB database, a drop-in replacement for MySQL
 Name:		mariadb
-Version:	11.2.4
-Release:	1
-URL:		http://mariadb.org/
+Version:	12.2.2
+Release:	2
+URL:		https://mariadb.org/
 License:	GPL
 Group:		System/Servers
-Source0:	https://mirror.mva-n.net/mariadb//mariadb-%{version}/source/mariadb-%{version}.tar.gz
+Source0:	https://mirror1.hs-esslingen.de/pub/Mirrors/mariadb//mariadb-%{version}/source/mariadb-%{version}.tar.gz
 Source1:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mysql_config_multilib.sh
 Source2:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/my.cnf.in
 Source3:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb.tmpfiles.d.in
-Source4:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mysql.service.in
+# The systemd unit files are *not* identical to Fedora's.
+Source4:	mysql.service.in
 Source5:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-prepare-db-dir.sh
 Source6:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-check-socket.sh
 Source7:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-scripts-common.sh
 Source8:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mariadb-check-upgrade.sh
-Source9:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/mysql@.service.in
+Source9:	mysql@.service.in
 Source10:	https://src.fedoraproject.org/rpms/mariadb/raw/rawhide/f/clustercheck.sh
 Source20:	mariadb.sysusers
 Source1000:	%{name}.rpmlintrc
+Patch1:		https://github.com/MariaDB/server/commit/87309d3d4.patch
+Patch2:		mariadb-omv-paths.patch
 # Fedora patches
 #   Patch4: Red Hat distributions specific logrotate fix
 #   it would be big unexpected change, if we start shipping it now. Better wait for MariaDB 10.2
@@ -57,10 +60,14 @@ Patch102:	mariadb-10.3.6-enable-rocksdb-on-x86_32.patch
 Patch103:	mariadb-10.4.4-static-wsrep.patch
 # Fix libcurl detection/linkage
 Patch104:	mariadb-10.9.2-fix-libcurl-detection.patch
+# Make compiling great again
+Patch105:	mariadb-11.7.2-compile.patch
+#Patch106:	mariadb-fix-fmt-detection.patch
 Requires:	%{name}-server = %{EVRD}
 Requires:	%{name}-client = %{EVRD}
 BuildRequires:	bison
 BuildRequires:	cmake
+BuildRequires:	make
 BuildRequires:	dos2unix
 BuildRequires:	doxygen
 BuildRequires:	python
@@ -258,8 +265,10 @@ Plugins for the MariaDB database.
 %{_libdir}/mysql/plugin/auth_ed25519.so
 %{_libdir}/mysql/plugin/auth_gssapi.so
 %{_libdir}/mysql/plugin/auth_gssapi_client.so
+%{_libdir}/mysql/plugin/auth_mysql_sha2.so
 %{_libdir}/mysql/plugin/auth_test_plugin.so
 %{_libdir}/mysql/plugin/auth_pam.so
+%{_libdir}/mysql/plugin/auth_parsec.so
 # Change from root:root to mysql:mysql, so it can be accessed by the server
 %attr(0755,mysql,mysql) %dir %{_libdir}/mysql/plugin/auth_pam_tool_dir
 %{_libdir}/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
@@ -287,6 +296,7 @@ Plugins for the MariaDB database.
 %{_libdir}/mysql/plugin/metadata_lock_info.so
 %{_libdir}/mysql/plugin/mypluglib.so
 %{_libdir}/mysql/plugin/mysql_clear_password.so
+%{_libdir}/mysql/plugin/parsec.so
 %{_libdir}/mysql/plugin/qa_auth_client.so
 %{_libdir}/mysql/plugin/qa_auth_interface.so
 %{_libdir}/mysql/plugin/qa_auth_server.so
@@ -310,12 +320,27 @@ Plugins for the MariaDB database.
 %{_libdir}/mysql/plugin/file_key_management.so
 %{_libdir}/mysql/plugin/simple_password_check.so
 %{_libdir}/mysql/plugin/wsrep_info.so
-%ifarch %{armx} x86_64 %{ix86} znver1
-%{_datadir}/mysql/JavaWrappers.jar
-%endif
-%optional %{_datadir}/mysql/JdbcInterface.jar
-%optional %{_datadir}/mysql/Mongo2.jar
-%optional %{_datadir}/mysql/Mongo3.jar
+
+%package jdbc
+Summary:	MariaDB JDBC interface
+Group:		Databases
+
+%description jdbc
+MariaDB JDBC interface
+
+%files jdbc
+%{_datadir}/mysql/JdbcInterface.jar
+
+%package mongo
+Summary:	MariaDB MongoDB interface
+Group:		Databases
+
+%description mongo
+MariaDB MongoDB interface
+
+%files mongo
+%{_datadir}/mysql/Mongo2.jar
+%{_datadir}/mysql/Mongo3.jar
 
 %package test
 Summary:	MariaDB test suite
@@ -386,7 +411,6 @@ package '%{name}'.
 %doc %{_mandir}/man1/mariadb-backup.1*
 %{_bindir}/mbstream
 %dir %{_datadir}/mysql
-%{_datadir}/mysql/errmsg-utf8.txt
 %{_datadir}/mysql/fill_help_tables.sql
 %{_datadir}/mysql/mariadb_performance_tables.sql
 %{_datadir}/mysql/mariadb_system_tables.sql
@@ -718,6 +742,7 @@ sed -i 's|WSREP_NORETURN|__attribute__((noreturn))|' wsrep-lib/include/wsrep/thr
 	-DFEATURE_SET="community" \
 	-DWITH_SSL=system \
 	-DWITH_ZLIB=system \
+	-DWITH_FMT=system \
 %if %{with pcre}
 	-DWITH_PCRE=system \
 %endif
diff --git a/mysql.service.in b/mysql.service.in
index 91dfeca..3eddb79 100644
--- a/mysql.service.in
+++ b/mysql.service.in
@@ -26,12 +26,23 @@ After=network.target
 WantedBy=multi-user.target
 Alias=mysql.service
 Alias=mysqld.service
+Alias=mariadb.service
 
 [Service]
 Type=notify
 User=mysql
 Group=mysql
 
+RuntimeDirectory=mysqld
+RuntimeDirectoryMode=0755
+
+ProtectSystem=strict
+ReadWritePaths=/srv/mysql /run/mysqld
+ProtectHome=true
+NoNewPrivileges=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+
 ExecStartPre=@libexecdir@/mariadb-check-socket
 # '%n' expands to 'Full unit name'; man systemd.unit
 ExecStartPre=@libexecdir@/mariadb-prepare-db-dir %n
diff --git a/mysql@.service.in b/mysql@.service.in
index acb2c57..17e95fb 100644
--- a/mysql@.service.in
+++ b/mysql@.service.in
@@ -48,12 +48,23 @@ After=network.target
 WantedBy=multi-user.target
 Alias=mysql.service
 Alias=mysqld.service
+Alias=mariadb.service
 
 [Service]
 Type=notify
 User=mysql
 Group=mysql
 
+RuntimeDirectory=mysqld
+RuntimeDirectoryMode=0755
+
+ProtectSystem=strict
+ReadWritePaths=/srv/mysql /run/mysqld
+ProtectHome=true
+NoNewPrivileges=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+
 ExecStartPre=@libexecdir@/mariadb-check-socket --defaults-group-suffix=.%I
 ExecStartPre=@libexecdir@/mariadb-prepare-db-dir --defaults-group-suffix=.%I %n
 # MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf