import CS git mariadb-11.8.8-1.el9
This commit is contained in:
AlmaLinux RelEng Bot
parent
dc3cd29068
commit
75da9f9d1a
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1,3 @@
|
||||
SOURCES/fmt-12.1.0.zip
|
||||
SOURCES/mariadb-11.8.6.tar.gz
|
||||
SOURCES/mariadb-11.8.8.tar.gz
|
||||
SOURCES/pcre2-10.47.zip
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
b7ac21c8a893c29a963634e289632c4a202c7b4e SOURCES/fmt-12.1.0.zip
|
||||
67708c3a39324d1013e58c965c8ebad10b7e5663 SOURCES/mariadb-11.8.6.tar.gz
|
||||
3d2ae312418e2f40dd14e51eefd4d7751c4c5f25 SOURCES/mariadb-11.8.8.tar.gz
|
||||
c800cd92e3deadd170996c168d47fa5fbd77eaf8 SOURCES/pcre2-10.47.zip
|
||||
|
||||
@ -0,0 +1,34 @@
|
||||
Patch for MDEV-39691 from this upstream PR:
|
||||
https://github.com/MariaDB/server/pull/5104/changes/0a66c466f1772945d46b12bd340e1bd9adff4e9b
|
||||
|
||||
|
||||
|
||||
From 0a66c466f1772945d46b12bd340e1bd9adff4e9b Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Black <daniel@mariadb.org>
|
||||
Date: Thu, 21 May 2026 15:08:01 +1000
|
||||
Subject: [PATCH] MDEV-39691 wsrep.cnf contains deprecated wsrep_causal_reads
|
||||
|
||||
wsrep_causal_reads was deprecated in 10.1.3 and removed in 11.3.1.
|
||||
Put in place the equivalent (and default) wsrep_sync_wait=0.
|
||||
|
||||
Amend a few early comments to show MariaDB as our product.
|
||||
---
|
||||
support-files/wsrep.cnf.sh | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh
|
||||
index 7242fff9f7ac0..54d67d951d3b2 100644
|
||||
--- a/support-files/wsrep.cnf.sh
|
||||
+++ b/support-files/wsrep.cnf.sh
|
||||
@@ -87,8 +87,9 @@ wsrep_auto_increment_control=1
|
||||
# retry autoinc insert, which failed for duplicate key error
|
||||
wsrep_drupal_282555_workaround=0
|
||||
|
||||
-# enable "strictly synchronous" semantics for read operations
|
||||
-wsrep_causal_reads=0
|
||||
+# Syncronization causality setting, (0 - disabled)
|
||||
+# same as deprecated and removed wsrep_causal_reads=0.
|
||||
+wsrep_sync_wait=0
|
||||
|
||||
# Command to call when node status or cluster membership changes.
|
||||
# Will be passed all or some of the following options:
|
||||
@ -1,75 +0,0 @@
|
||||
diff -Naur mariadb-11.8.6/mysql-test/main/skip_grants.result mariadb-11.8.6_patched/mysql-test/main/skip_grants.result
|
||||
--- mariadb-11.8.6/mysql-test/main/skip_grants.result 2026-01-31 14:27:46.000000000 +0100
|
||||
+++ mariadb-11.8.6_patched/mysql-test/main/skip_grants.result 2026-02-18 13:58:02.842715556 +0100
|
||||
@@ -152,4 +152,44 @@
|
||||
#
|
||||
select * from information_schema.users;
|
||||
USER PASSWORD_ERRORS PASSWORD_EXPIRATION_TIME
|
||||
+#
|
||||
+# 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 Options mysql servers CHECK
|
||||
+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 11.8 tests
|
||||
diff -Naur mariadb-11.8.6/mysql-test/main/skip_grants.test mariadb-11.8.6_patched/mysql-test/main/skip_grants.test
|
||||
--- mariadb-11.8.6/mysql-test/main/skip_grants.test 2026-01-31 14:27:46.000000000 +0100
|
||||
+++ mariadb-11.8.6_patched/mysql-test/main/skip_grants.test 2026-02-18 13:12:21.663377393 +0100
|
||||
@@ -191,4 +191,10 @@
|
||||
--echo #
|
||||
select * from information_schema.users;
|
||||
|
||||
+--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 11.8 tests
|
||||
diff -Naur mariadb-11.8.6/sql/sql_acl.cc mariadb-11.8.6_patched/sql/sql_acl.cc
|
||||
--- mariadb-11.8.6/sql/sql_acl.cc 2026-01-31 14:27:48.000000000 +0100
|
||||
+++ mariadb-11.8.6_patched/sql/sql_acl.cc 2026-02-18 13:13:21.601008459 +0100
|
||||
@@ -3927,6 +3927,9 @@
|
||||
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])
|
||||
@ -1,6 +1,6 @@
|
||||
# Plain package name for cases, where %%{name} differs (e.g. for versioned packages)
|
||||
%global majorname mariadb
|
||||
%global package_version 11.8.6
|
||||
%global package_version 11.8.8
|
||||
%global 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 11.8.6
|
||||
%global last_tested_version 11.8.8
|
||||
# Set to 1 to force run the testsuite even if it was already tested in current version
|
||||
%global force_run_testsuite 0
|
||||
|
||||
@ -170,7 +170,7 @@
|
||||
|
||||
Name: %{majorname}
|
||||
Version: %{package_version}
|
||||
Release: 2%{?with_debug:.debug}%{?dist}
|
||||
Release: 1%{?with_debug:.debug}%{?dist}
|
||||
Epoch: 3
|
||||
|
||||
Summary: A very fast and robust SQL database server
|
||||
@ -239,8 +239,8 @@ Patch14: %{majorname}-mtr.patch
|
||||
|
||||
Patch16: %{majorname}-federated.patch
|
||||
Patch18: pcre_bundling.patch
|
||||
|
||||
Patch17: upstream_87309d3d4bb8f48910d05b0ca5ee989bcdd6b053.patch
|
||||
# Patch19: fix default Galera configuation file
|
||||
Patch19: upstream_0a66c466f1772945d46b12bd340e1bd9adff4e9b.patch
|
||||
|
||||
# This macro is used for package/sub-package names in the entire specfile
|
||||
%if %?mariadb_default
|
||||
@ -898,10 +898,10 @@ rm -r storage/rocksdb/
|
||||
|
||||
%patch -P14 -p1
|
||||
%patch -P16 -p1
|
||||
%patch -P17 -p1
|
||||
%if %{with bundled_pcre}
|
||||
%patch -P18 -p1
|
||||
%endif
|
||||
%patch -P19 -p1
|
||||
|
||||
# generate a list of tests that fail, but are not disabled by upstream
|
||||
cat %{SOURCE50} | tee -a mysql-test/unstable-tests
|
||||
@ -1480,6 +1480,7 @@ fi
|
||||
%{_bindir}/mysql{admin,binlog,check,dump,import,_plugin,show,slap,_tzinfo_to_sql,_waitpid}
|
||||
%{_bindir}/mariadb-{admin,binlog,check,dump,import,plugin,show,slap,tzinfo-to-sql,waitpid}
|
||||
%{_bindir}/my_print_defaults
|
||||
%{_bindir}/mariadb-migrate-config-file
|
||||
|
||||
%{_mandir}/man1/{msql2mysql,replace}.1*
|
||||
%{_mandir}/man1/{mysql,mariadb}.1*
|
||||
@ -1514,7 +1515,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}
|
||||
@ -1557,7 +1557,6 @@ fi
|
||||
|
||||
%if %{with galera}
|
||||
%files -n %{pkgname}-server-galera
|
||||
%doc Docs/README-wsrep
|
||||
%license LICENSE.clustercheck
|
||||
%{_bindir}/clustercheck
|
||||
%{_bindir}/galera_new_cluster
|
||||
@ -1851,6 +1850,8 @@ fi
|
||||
%{_libdir}/%{majorname}/plugin/type_mysql_timestamp.so
|
||||
%{_libdir}/%{majorname}/plugin/type_test.so
|
||||
%{_libdir}/%{majorname}/plugin/daemon_example.ini
|
||||
%dir %{_libdir}/%{majorname}/plugin/test_pam_modules
|
||||
%{_libdir}/%{majorname}/plugin/test_pam_modules/pam_mariadb_mtr.so
|
||||
%attr(-,mysql,mysql) %{_datadir}/mariadb-test
|
||||
%{_mandir}/man1/{mysql_client_test,mysqltest,mariadb-client-test,mariadb-test}.1*
|
||||
%{_mandir}/man1/my_safe_process.1*
|
||||
@ -1859,6 +1860,12 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Jun 03 2026 Pavol Sloboda <psloboda@redhat.com> - 3:11.8.8-1
|
||||
- Rebase to 11.8.8
|
||||
|
||||
* Wed May 20 2026 Michal Schorm <mschorm@redhat.com> - 3:11.8.7-1
|
||||
- Rebase to 11.8.7
|
||||
|
||||
* Wed Feb 18 2026 Pavol Sloboda <psloboda@redhat.com> - 3:11.8.6-2
|
||||
- Added a fix for SIGSEGV when using skip-grant-tables
|
||||
- Resolves: RHBZ#2438390
|
||||
|
||||
Loading…
Reference in New Issue
Block a user