[rpms/mariadb10.11] rawhide: Rebase to 10.11.17

[rpms/mariadb10.11] rawhide: Rebase to 10.11.17

[Pavol Sloboda]

            A new commit has been pushed.

            Repo   : rpms/mariadb10.11
            Branch : rawhide
            Commit : f74d68daa16b2a6a79dfb7ec904f583754e73d79
            Author : Pavol Sloboda <psloboda@redhat.com>
            Date   : 2026-05-26T16:12:22+02:00
            Stats  : +11/-94 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/mariadb10.11/c/f74d68daa16b2a6a79dfb7ec904f583754e73d79?branch=rawhide

            Log:
            Rebase to 10.11.17

MariaDB 10.11.17 is being built on mariadb-connector-c 3.3.19 while MariaDB
11.8.7 is being built on 3.4.9. Therefore the removal of the
mark-RISC-V64-as-64-bit-architecture.patch
is not possible on MariaDB 10.11 as it hasn't reached this version on
upstream yet.

Dropped patch (merged upstream):
- Patch17: MDEV-38811 crash in information_schema.table_constraints with --skip-grant-tables
  Upstream: 87309d3d4bb8f48910d05b0ca5ee989bcdd6b053
  https://jira.mariadb.org/browse/MDEV-38811

Removed Docs/README-wsrep from -server-galera (MDEV-39031):
  Outdated documentation removed upstream in facc3345c63a68719b14258643591f2ac92cf2dd
  https://jira.mariadb.org/browse/MDEV-39031

Other changes:
    - Add test_pam_modules dir and pam_mariadb_mtr.so to -test subpackage
    - Add plugins.mdev38550 to skipped tests list - it requires plugin that is shipped only by mariadb-connector-c in Fedora
    - Upstream updated bundled PCRE version to 10.47

Upstream changelog:
    https://mariadb.com/docs/release-notes/community-server/changelogs/10.11/10.11.17
Upstream release notes:
    https://mariadb.com/docs/release-notes/community-server/10.11/10.11.17

---
diff --git a/mariadb10.11.spec b/mariadb10.11.spec
index f8977ae..dafbed1 100644
--- a/mariadb10.11.spec
+++ b/mariadb10.11.spec
@@ -1,6 +1,6 @@
 # Plain package name for cases, where %%{name} differs (e.g. for versioned packages)
 %global majorname mariadb
-%define package_version 10.11.16
+%define package_version 10.11.17
 %define majorversion %(echo %{package_version} | cut -d'.' -f1-2 )
 
 # Set if this package will be the default one in distribution
@@ -15,7 +15,7 @@
 # The last version on which the full testsuite has been run
 # In case of further rebuilds of that version, don't require full testsuite to be run
 # run only "main" suite
-%global last_tested_version 10.11.16
+%global last_tested_version 10.11.17
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -119,7 +119,7 @@
 #   https://mariadb.com/kb/en/pcre/
 %bcond bundled_pcre 0
 %if %{with bundled_pcre}
-%global pcre_bundled_version 10.45
+%global pcre_bundled_version 10.47
 %endif
 
 # To avoid issues with a breaking change in FMT library, bundle it on systems where FMT wasn't fixed yet
@@ -191,7 +191,7 @@ Provides: mariadb%{majorversion}%{?1:-%{1}}%{?_isa} = %{sameevr}\
 
 Name:             %{majorname}%{majorversion}
 Version:          %{package_version}
-Release:          3%{?with_debug:.debug}%{?dist}
+Release:          1%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -259,8 +259,6 @@ Patch13:          %{majorname}-libfmt.patch
 Patch14:          %{majorname}-mtr.patch
 #   Patch15: mark RISC-V64 as 64-bit architecture
 Patch15:          mark-RISC-V64-as-64-bit-architecture.patch
-#   Patch16: fixup for SISGSEGV while using skip-grant-tables
-Patch16:          upstream_87309d3d4bb8f48910d05b0ca5ee989bcdd6b053.patch
 
 # This macro is used for package/sub-package names in the entire specfile
 %if %?mariadb_default
@@ -879,8 +877,6 @@ rm -r storage/rocksdb/
 %patch -P14 -p1
 %patch -P15 -p1
 
-%patch -P16 -p1
-
 # generate a list of tests that fail, but are not disabled by upstream
 cat %{SOURCE50} | tee -a mysql-test/unstable-tests
 
@@ -1501,7 +1497,6 @@ fi
 %if %{with common}
 %files -n %{pkgname}-common
 %doc %{_docdir}/%{majorname}
-%{?with_galera:%exclude %{_docdir}/%{majorname}/MariaDB-server-%{version}/README-wsrep}
 %dir %{_datadir}/%{majorname}
 %{_datadir}/%{majorname}/charsets
 %if %{with clibrary}
@@ -1544,7 +1539,6 @@ fi
 
 %if %{with galera}
 %files -n %{pkgname}-server-galera
-%doc Docs/README-wsrep
 %license LICENSE.clustercheck
 %{_bindir}/clustercheck
 %{_bindir}/galera_new_cluster
@@ -1823,6 +1817,7 @@ fi
 %{_bindir}/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}
 %{_bindir}/my_safe_process
 %dir %{_libdir}/%{majorname}/plugin
+%dir %{_libdir}/%{majorname}/plugin/test_pam_modules/
 # shared objects required for testing
 %{_libdir}/%{majorname}/plugin/adt_null.so
 %{_libdir}/%{majorname}/plugin/auth_0x0100.so
@@ -1840,6 +1835,7 @@ fi
 %{_libdir}/%{majorname}/plugin/qa_auth_server.so
 %{_libdir}/%{majorname}/plugin/test_sql_service.so
 %{_libdir}/%{majorname}/plugin/test_versioning.so
+%{_libdir}/%{majorname}/plugin/test_pam_modules/pam_%{majorname}_mtr.so
 %{_libdir}/%{majorname}/plugin/type_mysql_timestamp.so
 %{_libdir}/%{majorname}/plugin/type_test.so
 %{_libdir}/%{majorname}/plugin/daemon_example.ini
@@ -1851,6 +1847,9 @@ fi
 %endif
 
 %changelog
+* Tue May 26 2026 Pavol Sloboda <psloboda@redhat.com> - 3:10.11.17-1
+- Rebase to 10.11.17
+
 * Thu Mar 19 2026 Michal Schorm <mschorm@redhat.com> - 3:10.11.16-3
 - Bump release for package rebuild
 

diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index f2b7d50..69f5f6b 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -6,6 +6,7 @@ main.ssl_crl                                 : #1399847
 # Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead
 plugins.auth_ed25519                         :
 plugins.multiauth                            :
+plugins.mdev38550                           :
 
 # ------------------------------
 perfschema.nesting                           : #1399847

diff --git a/sources b/sources
index bb6cbf8..b5dd59e 100755
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.11.16.tar.gz) = 202ad856dad6ffaf5800e3629e938865c07e8590efafeb696aa9b0c7599e4e3b4eefb977f4c8f65bf03a5d6d4a6ac40154d62566a33fc6bf048cbeb79969601f
+SHA512 (mariadb-10.11.17.tar.gz) = 788803b15afbb6193111774a233d0db0604f27ebae3b4b439368e2d7caeffb662846e530fa65f453a6d77541cedb99112ea319c7c0c2ce5074c32aefb06a51aa

diff --git a/upstream_87309d3d4bb8f48910d05b0ca5ee989bcdd6b053.patch b/upstream_87309d3d4bb8f48910d05b0ca5ee989bcdd6b053.patch
deleted file mode 100644
index 67a3647..0000000
--- a/upstream_87309d3d4bb8f48910d05b0ca5ee989bcdd6b053.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-diff --git a/mysql-test/main/skip_grants.result b/mysql-test/main/skip_grants.result
-index 316c44e13539d..2f8a708a7b0a0 100644
---- a/mysql-test/main/skip_grants.result
-+++ b/mysql-test/main/skip_grants.result
-@@ -156,6 +156,44 @@ SELECT @@skip_grant_tables AS EXPECT_0;
- EXPECT_0
- 0
- # restart: --skip-grant-tables
--#
- # End of 10.10 tests
- #
-+# MDEV-38811 crash in information_schema.table_constraints when --skip-grant-tables
-+#
-+select * from information_schema.table_constraints;
-+CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE
-+def	mysql	Host	mysql	roles_mapping	UNIQUE
-+def	mysql	PRIMARY	mysql	column_stats	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	columns_priv	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	db	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	event	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	func	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	global_priv	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	gtid_slave_pos	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	help_category	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	help_keyword	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	help_relation	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	help_topic	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	index_stats	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	plugin	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	proc	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	procs_priv	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	proxies_priv	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	servers	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	table_stats	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	tables_priv	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	time_zone	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	time_zone_leap_second	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	time_zone_name	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	time_zone_transition	PRIMARY KEY
-+def	mysql	PRIMARY	mysql	time_zone_transition_type	PRIMARY KEY
-+def	mysql	Priv	mysql	global_priv	CHECK
-+def	mysql	name	mysql	help_category	UNIQUE
-+def	mysql	name	mysql	help_keyword	UNIQUE
-+def	mysql	name	mysql	help_topic	UNIQUE
-+def	sys	PRIMARY	sys	sys_config	PRIMARY KEY
-+Warnings:
-+Warning	1286	Unknown storage engine 'InnoDB'
-+Warning	1286	Unknown storage engine 'InnoDB'
-+Warning	1286	Unknown storage engine 'InnoDB'
-+# End of 10.11 tests
-diff --git a/mysql-test/main/skip_grants.test b/mysql-test/main/skip_grants.test
-index bbdb5935d3e5a..9dbff9c2b4ed2 100644
---- a/mysql-test/main/skip_grants.test
-+++ b/mysql-test/main/skip_grants.test
-@@ -195,6 +195,12 @@ SELECT @@skip_grant_tables AS EXPECT_0;
- --let $restart_parameters = --skip-grant-tables
- --source include/restart_mysqld.inc
- 
----echo #
- --echo # End of 10.10 tests
-+
- --echo #
-+--echo # MDEV-38811 crash in information_schema.table_constraints when --skip-grant-tables
-+--echo #
-+--sorted_result
-+select * from information_schema.table_constraints;
-+
-+--echo # End of 10.11 tests
-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])
-