diff --git a/mariadb-10.5.25.tar.gz b/mariadb-11.8.1.tar.gz similarity index 32% rename from mariadb-10.5.25.tar.gz rename to mariadb-11.8.1.tar.gz index c7b8e76450721e1a595d968473c39a0588e46dc2..ae8279f71e8f41e399e6b2c05acdec0787730bc5 100644 --- a/mariadb-10.5.25.tar.gz +++ b/mariadb-11.8.1.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9619d0f51e864357466b2c63301a34a53f7dfd99f18c4fd452fab22bf39ba64e -size 115951936 +oid sha256:c58e9e96e8e69dba09aa179b9bea63fc2775f3194efb72dfc2c277abfb9936e5 +size 112837824 diff --git a/mariadb-RISC-V-use-RDTIME-for-cycle-timer.patch b/mariadb-RISC-V-use-RDTIME-for-cycle-timer.patch deleted file mode 100644 index e9cd5e5cb6173e11bfc3af60988f3512c0ccf1c6..0000000000000000000000000000000000000000 --- a/mariadb-RISC-V-use-RDTIME-for-cycle-timer.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 841bfb4641f4cbad16a3aeb07fa462dcd4449cac Mon Sep 17 00:00:00 2001 -From: IZUMI-Zu -Date: Fri, 23 Aug 2024 00:00:12 +0800 -Subject: [PATCH] RISC-V: use RDTIME for cycle timer and disable __builtin_readcyclecounter - -This commit backports and extends the fixes from MariaDB/server PRs #1981 -and #2980 to address the RISC-V RDCYCLE privileged instruction issue. - -Key changes: -1. Use RDTIME instead of RDCYCLE for cycle timer on RISC-V -2. Disable __builtin_readcyclecounter() for RISC-V as LLVM generates RDCYCLE - -Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. -There is a sysctl option to change that as a transition period, but it will eventually disappear. - -Use RDTIME instead, which while less accurate has the advantage of being synchronized between CPU (and thus monotonic) -and of constant frequency. - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 - -Backported-from: https://github.com/MariaDB/server/pull/1981 - https://github.com/MariaDB/server/pull/2980 ---- - include/my_rdtsc.h | 26 +++++++++++++++++++++++++- - mysys/my_rdtsc.c | 2 ++ - 2 files changed, 27 insertions(+), 1 deletion(-) - -diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h -index e8101516..880625fa 100644 ---- a/include/my_rdtsc.h -+++ b/include/my_rdtsc.h -@@ -91,6 +91,7 @@ C_MODE_START - On AARCH64, we use the generic timer base register. We override clang - implementation for aarch64 as it access a PMU register which is not - guaranteed to be active. -+ On RISC-V, we use the rdtime instruction to read from mtime register. - - Sadly, we have nothing for the Digital Alpha, MIPS, Motorola m68k, - HP PA-RISC or other non-mainstream (or obsolete) processors. -@@ -128,7 +129,7 @@ C_MODE_START - */ - static inline ulonglong my_timer_cycles(void) - { --# if __has_builtin(__builtin_readcyclecounter) && !defined (__aarch64__) -+# if __has_builtin(__builtin_readcyclecounter) && !defined(__aarch64__) && !defined(__riscv) - return __builtin_readcyclecounter(); - # elif defined _WIN32 || defined __i386__ || defined __x86_64__ - return __rdtsc(); -@@ -173,6 +174,28 @@ static inline ulonglong my_timer_cycles(void) - __asm __volatile("mrs %0, CNTVCT_EL0" : "=&r" (result)); - return result; - } -+#elif defined(__riscv) -+ /* Use RDTIME (and RDTIMEH on riscv32) */ -+ { -+# if __riscv_xlen == 32 -+ ulong result_lo, result_hi0, result_hi1; -+ /* Implemented in assembly because Clang insisted on branching. */ -+ __asm __volatile__( -+ "rdtimeh %0\n" -+ "rdtime %1\n" -+ "rdtimeh %2\n" -+ "sub %0, %0, %2\n" -+ "seqz %0, %0\n" -+ "sub %0, zero, %0\n" -+ "and %1, %1, %0\n" -+ : "=r"(result_hi0), "=r"(result_lo), "=r"(result_hi1)); -+ return (static_cast(result_hi1) << 32) | result_lo; -+# else -+ ulonglong result; -+ __asm __volatile__("rdtime %0" : "=r"(result)); -+ return result; -+ } -+# endif - #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) - /* gethrtime may appear as either cycle or nanosecond counter */ - return (ulonglong) gethrtime(); -@@ -231,6 +254,7 @@ C_MODE_END - #define MY_TIMER_ROUTINE_GETSYSTEMTIMEASFILETIME 26 - #define MY_TIMER_ROUTINE_ASM_S390 28 - #define MY_TIMER_ROUTINE_AARCH64 29 -+#define MY_TIMER_ROUTINE_RISCV 30 - - #endif - -diff --git a/mysys/my_rdtsc.c b/mysys/my_rdtsc.c -index 1503a5db..ffd81602 100644 ---- a/mysys/my_rdtsc.c -+++ b/mysys/my_rdtsc.c -@@ -384,6 +384,8 @@ void my_timer_init(MY_TIMER_INFO *mti) - mti->cycles.routine= MY_TIMER_ROUTINE_ASM_S390; - #elif defined(__GNUC__) && defined (__aarch64__) - mti->cycles.routine= MY_TIMER_ROUTINE_AARCH64; -+#elif defined(__GNUC__) && defined (__riscv) -+ mti->cycles.routine= MY_TIMER_ROUTINE_RISCV; - #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME) - mti->cycles.routine= MY_TIMER_ROUTINE_GETHRTIME; - #else --- -2.46.0 diff --git a/mariadb-logrotate.patch b/mariadb-logrotate.patch index f436a9d956175ad6f7d56e0a55a48a7817b357d7..ec522b0306c5f2b2e5c9b2c3bdef4662b41aed1d 100644 --- a/mariadb-logrotate.patch +++ b/mariadb-logrotate.patch @@ -1,51 +1,32 @@ -diff -Naur mariadb-10.5.15/support-files/mysql-log-rotate.sh mariadb-10.5.15_patched/support-files/mysql-log-rotate.sh ---- mariadb-10.5.15/support-files/mysql-log-rotate.sh 2022-02-10 20:11:35.000000000 +0000 -+++ mariadb-10.5.15_patched/support-files/mysql-log-rotate.sh 2022-04-14 11:31:55.344000000 +0000 -@@ -3,36 +3,24 @@ - # in the [mysqld] section as follows: - # - # [mysqld] --# log-error=@localstatedir@/mysqld.log --# --# If the root user has a password you have to create a --# /root/.my.cnf configuration file with the following --# content: --# --# [mysqladmin] --# password = --# user= root --# --# where "" is the password. --# --# ATTENTION: This /root/.my.cnf should be readable ONLY --# for root ! -+# log-error=@LOG_LOCATION@ +Adjust the 'mariadb.logrotate.sh' script in several ways: + +* Use the correct log file pathname for Red Hat installations. + +* Remove Debian specific code + for the very unlikely, but possible scenario + in which the debian config file would exist. + +--- mariadb-10.11.6/support-files/mariadb.logrotate.sh 2023-11-08 16:51:43.000000000 +0100 ++++ mariadb-10.11.6/support-files/mariadb.logrotate.sh_patched 2023-12-17 18:03:36.955861025 +0100 +@@ -6,7 +6,7 @@ + # Read https://mariadb.com/kb/en/error-log/ to learn more about logging and + # https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/ about rotating logs. --@localstatedir@/mysqld.log { -- # create 600 mysql mysql +-@localstatedir@/mysqld.log @localstatedir@/mariadb.log @logdir@/*.log { +@LOG_LOCATION@ { -+ create 600 mysql mysql - su mysql mysql - notifempty - daily - rotate 3 - missingok - compress -+ delaycompress -+ sharedscripts -+ - postrotate -- # just if mariadbd is really running -- if test -x @bindir@/mysqladmin && \ -- @bindir@/mysqladmin ping &>/dev/null -- then -- @bindir@/mysqladmin --local flush-error-log \ -- flush-engine-log flush-general-log flush-slow-log -- fi -+ # just if mariadbd is really running -+ if [ -e @PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid ] -+ then -+ kill -1 $(<@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid) -+ fi - endscript - } + + # Depends on a mysql@localhost unix_socket authenticated user with RELOAD privilege + @su_user@ +@@ -45,11 +45,6 @@ + # has thanks to the default use of Unix socket authentication for the 'mysql' + # (or root on Debian) account used everywhere since MariaDB 10.4. + postrotate +- if test -r /etc/mysql/debian.cnf +- then +- EXTRAPARAM='--defaults-file=/etc/mysql/debian.cnf' +- fi +- + if test -x @bindir@/mariadb-admin + then + @bindir@/mariadb-admin $EXTRAPARAM --local flush-error-log \ + diff --git a/mariadb-ownsetup.patch b/mariadb-ownsetup.patch index 7728cf1a62d9994ec9f6b08297176b93817d06fc..9c15183da71b9c4dbf42c27ad54f9f92da817191 100644 --- a/mariadb-ownsetup.patch +++ b/mariadb-ownsetup.patch @@ -1,6 +1,8 @@ ---- mariadb-10.4.14/support-files/CMakeLists.txt 2020-08-06 17:28:28.000000000 +0200 -+++ mariadb-10.4.14/support-files/CMakeLists.txt_patched 2020-09-03 13:21:07.826658279 +0200 -@@ -187,6 +187,7 @@ IF(UNIX) +diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt +index ae7f906..7882368 100644 +--- a/support-files/CMakeLists.txt ++++ b/support-files/CMakeLists.txt +@@ -242,6 +242,7 @@ IF(UNIX AND NOT WITHOUT_SERVER) COMPONENT SharedLibraries) INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT Client) @@ -8,14 +10,14 @@ INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT IniFiles) INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR} - -diff -up mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup mariadb-10.0.15/support-files/rpm/server.cnf ---- mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup 2015-01-24 23:55:55.110063592 +0100 -+++ mariadb-10.0.15/support-files/rpm/server.cnf 2015-01-24 23:57:42.308114387 +0100 -@@ -9,7 +9,16 @@ - [server] +diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf +index 98190e1..29c3976 100644 +--- a/support-files/rpm/server.cnf ++++ b/support-files/rpm/server.cnf +@@ -12,7 +12,15 @@ + [mariadb] - # this is only for the mysqld standalone daemon + # This group is read by both MariaDB and MySQL servers +# Settings user and group are ignored when systemd is used. +# If you need to run mysqld under a different user or group, +# customize your systemd unit file for mysqld/mariadb according to the @@ -25,7 +27,6 @@ diff -up mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup mariadb-10.0.15/s +socket=@MYSQL_UNIX_ADDR@ +log-error=@LOG_LOCATION@ +pid-file=@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid -+ # # * Galera-related settings diff --git a/mariadb-scripts.patch b/mariadb-scripts.patch index 3b6dc1689cb03bf71dfdcf74862888200915b10a..9ebdefee45e4935c70f2d12c3b0ebbdba918478a 100644 --- a/mariadb-scripts.patch +++ b/mariadb-scripts.patch @@ -4,8 +4,8 @@ be expanded by cmake. Cmake needs to know about them, so adding them manually. # Install libgcc as mylibgcc.a --- mariadb-10.5.5/scripts/CMakeLists.txt.old 2020-09-24 10:13:35.272589689 +0200 +++ mariadb-10.5.5/scripts/CMakeLists.txt 2020-09-24 10:17:31.428985798 +0200 -@@ -377,6 +377,34 @@ - INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT}) +@@ -404,6 +404,34 @@ ELSE() + INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT}Symlinks) ENDIF() ENDFOREACH() + diff --git a/mariadb-wsrep-lib-port-to-newer-cmake.patch b/mariadb-wsrep-lib-port-to-newer-cmake.patch new file mode 100644 index 0000000000000000000000000000000000000000..4a0dc1bdc1abe58d720d6ef528cf467a738a94e7 --- /dev/null +++ b/mariadb-wsrep-lib-port-to-newer-cmake.patch @@ -0,0 +1,13 @@ +diff --git a/wsrep-lib/CMakeLists.txt b/wsrep-lib/CMakeLists.txt +index ef2f4c8..c35c85b 100644 +--- a/wsrep-lib/CMakeLists.txt ++++ b/wsrep-lib/CMakeLists.txt +@@ -2,7 +2,7 @@ + # Copyright (C) 2021 Codership Oy + # + +-cmake_minimum_required (VERSION 2.8) ++cmake_minimum_required (VERSION 2.8...${CMAKE_VERSION}) + + # Parse version from version header file and store it into + # WSREP_LIB_VERSION. diff --git a/mariadb.spec b/mariadb.spec index d1f14a61d0687a10f594c65eb267423134c29a4c..a9f9f4dd2c782ac4c968b635666af964275616be 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -73,8 +73,8 @@ %global sameevr %{epoch}:%{version}-%{release} Name: mariadb -Version: 10.5.25 -Release: 4 +Version: 11.8.1 +Release: 1 Epoch: 4 Summary: A very fast and robust SQL database server @@ -101,6 +101,7 @@ Source71: LICENSE.clustercheck Source72: mariadb-server-galera.te +Patch1: mariadb-wsrep-lib-port-to-newer-cmake.patch # Patch4: yum distributions specific logrotate fix # it would be big unexpected change, if we start shipping it now. Better wait for MariaDB 10.2 Patch4: %{pkgnamepatch}-logrotate.patch @@ -112,14 +113,20 @@ Patch9: %{pkgnamepatch}-ownsetup.patch Patch10: %{pkgnamepatch}-ssl-cipher-tests.patch # Patch11: Use PCDIR CMake option, if configured Patch11: %{pkgnamepatch}-pcdir.patch -# Patch12: RISC-V: use RDTIME for cycle timer -Patch12: %{pkgnamepatch}-RISC-V-use-RDTIME-for-cycle-timer.patch -BuildRequires: make +BuildRequires: ninja-build mold BuildRequires: cmake gcc-c++ BuildRequires: multilib-rpm-config BuildRequires: selinux-policy-devel BuildRequires: systemd systemd-devel +BuildRequires: liburing-devel +BuildRequires: libcurl-devel +BuildRequires: bzip2-devel +BuildRequires: xz-devel +BuildRequires: lzo-devel +BuildRequires: fmt-devel +BuildRequires: snappy-devel +BuildRequires: /usr/bin/git # Page compression algorithms for InnoDB & XtraDB BuildRequires: zlib-devel @@ -618,14 +625,7 @@ sources. %prep -%setup -q -n mariadb-%{version} - -%patch -P4 -p1 -%patch -P7 -p1 -%patch -P9 -p1 -%patch -P10 -p1 -%patch -P11 -p1 -%patch -P12 -p1 +%autosetup -p1 -n mariadb-%{version} # Remove JAR files that upstream puts into tarball find . -name "*.jar" -type f -exec rm --verbose -f {} \; @@ -652,32 +652,7 @@ sed 's/mariadb-server-galera/%{name}-server-galera/' %{SOURCE72} > selinux/%{nam %endif -# Get version of PCRE, that upstream use -pcre_version=`grep -e "ftp.pcre.org/pub/pcre/pcre2" cmake/pcre.cmake | sed -r "s;[^0123456789]*2-([[:digit:]]+\.[[:digit:]]+)\.[^0123456789]*;\1;"` - -# Check if the PCRE version in macro 'pcre_bundled_version', used in Provides: bundled(...), is the same version as upstream actually bundles -%if %{without unbundled_pcre} -if [ %{pcre_bundled_version} != "$pcre_version" ] ; then - echo "\n Error: Bundled PCRE version is not correct. \n\tBundled version number:%{pcre_bundled_version} \n\tUpstream version number: $pcre_version\n" - exit 1 -fi -%else -# Check if the PCRE version that upstream use, is the same as the one present in system -pcre_system_version=`pkgconf %{_libdir}/pkgconfig/libpcre2-*.pc --modversion 2>/dev/null | head -n 1` - -if [ "$pcre_system_version" != "$pcre_version" ] ; then - echo "\n Warning: Error: Bundled PCRE version is not correct. \n\tSystem version number:$pcre_system_version \n\tUpstream version number: $pcre_version\n" -fi -%endif - - - %build -# This package has static probe points which do not currently -# work with LTO and result in undefined symbols at link time. -# This is being worked on in upstream GCC -%define _lto_cflags %{nil} - # fail quickly and obviously if user tries to build as root %if %runselftest if [ x"$(id -u)" = "x0" ]; then @@ -688,9 +663,29 @@ fi fi %endif +CFLAGS="$CFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +# force PIC mode so that we can build libmysqld.so +CFLAGS="$CFLAGS -fPIC" +# use mold for faster link +LDFLAGS="%{build_ldflags} -fuse-ld=mold" + +%if %{with debug} +# Override all optimization flags when making a debug build +# -D_FORTIFY_SOURCE requires optimizations enabled. Disable the fortify. +CFLAGS=`echo "$CFLAGS" | sed -r 's/-D_FORTIFY_SOURCE=[012]/-D_FORTIFY_SOURCE=0/'` +CFLAGS=`echo "$CFLAGS" | sed -r 's/-O[0123]//'` + +CFLAGS="$CFLAGS -O0 -g -D_FORTIFY_SOURCE=0" +%endif # debug + +CXXFLAGS="$CFLAGS" +CPPFLAGS="$CFLAGS" +export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS + # The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX # so we can't use %%{_datadir} and so forth here. %cmake \ + -G Ninja \ -DBUILD_CONFIG=mysql_release \ -DFEATURE_SET="community" \ -DINSTALL_LAYOUT=RPM \ @@ -730,6 +725,8 @@ fi -DWITH_MARIABACKUP=%{?with_backup:ON}%{!?with_backup:NO} \ -DWITH_UNIT_TESTS=%{?with_test:ON}%{!?with_test:NO} \ -DCONC_WITH_SSL=%{?with_clibrary:ON}%{!?with_clibrary:NO} \ + -DWITH_PCRE=system \ + -DWITH_LIBFMT=system \ -DWITH_SSL=system \ -DWITH_ZLIB=system \ -DLZ4_LIBS=%{_libdir}/liblz4.so \ @@ -752,25 +749,6 @@ fi -DCONNECT_WITH_JDBC=OFF \ %{?with_debug: -DCMAKE_BUILD_TYPE=Debug -DWITH_ASAN=OFF -DWITH_INNODB_EXTRA_DEBUG=ON -DWITH_VALGRIND=ON} - -CFLAGS="$CFLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" -# force PIC mode so that we can build libmysqld.so -CFLAGS="$CFLAGS -fPIC" - -%if %{with debug} -# Override all optimization flags when making a debug build -# -D_FORTIFY_SOURCE requires optimizations enabled. Disable the fortify. -CFLAGS=`echo "$CFLAGS" | sed -r 's/-D_FORTIFY_SOURCE=[012]/-D_FORTIFY_SOURCE=0/'` -CFLAGS=`echo "$CFLAGS" | sed -r 's/-O[0123]//'` - -CFLAGS="$CFLAGS -O0 -g -D_FORTIFY_SOURCE=0" -%endif # debug - -CXXFLAGS="$CFLAGS" -CPPFLAGS="$CFLAGS" -export CFLAGS CXXFLAGS CPPFLAGS - -%cmake -LAH %cmake_build # build selinux policy @@ -891,7 +869,7 @@ rm %{buildroot}%{_mandir}/man1/mariadb_config.1* # put logrotate script where it needs to be mkdir -p %{buildroot}%{logrotateddir} -mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name} +mv %{buildroot}%{_datadir}/%{pkg_name}/mariadb.logrotate %{buildroot}%{logrotateddir}/%{daemon_name} chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name} # for compatibility with upstream RPMs, create mysqld symlink in sbin @@ -914,8 +892,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysconfig touch %{buildroot}%{_sysconfdir}/sysconfig/clustercheck install -p -m 0755 %{_builddir}/mariadb-%{version}/scripts/clustercheck.sh %{buildroot}%{_bindir}/clustercheck -# remove duplicate logrotate script -rm %{buildroot}%{logrotateddir}/mysql # Remove AppArmor files rm -r %{buildroot}%{_datadir}/%{pkg_name}/policy/apparmor @@ -950,6 +926,7 @@ rm %{buildroot}%{_libdir}/libmariadb.so.* unlink %{buildroot}%{_libdir}/libmysqlclient.so unlink %{buildroot}%{_libdir}/libmysqlclient_r.so unlink %{buildroot}%{_libdir}/libmariadb.so +rm %{buildroot}%{_mandir}/man3/* # Client plugins rm %{buildroot}%{_libdir}/%{pkg_name}/plugin/{dialog.so,mysql_clear_password.so,sha256_password.so} %if %{with gssapi} @@ -1033,20 +1010,11 @@ rm %{buildroot}%{_bindir}/galera_recovery rm %{buildroot}%{_datadir}/%{pkg_name}/systemd/use_galera_new_cluster.conf %endif -%if %{without rocksdb} -rm %{buildroot}%{_mandir}/man1/{mysql_,mariadb-}ldb.1* -rm %{buildroot}%{_mandir}/man1/myrocks_hotbackup.1* -%endif - %if %{without backup} rm %{buildroot}%{_mandir}/man1/maria{,db-}backup.1* rm %{buildroot}%{_mandir}/man1/mbstream.1* %endif -%if %{without s3} -rm %{buildroot}%{_mandir}/man1/aria_s3_copy.1* -%endif - %check %if %{with test} %if %runselftest @@ -1179,7 +1147,6 @@ fi %if %{with errmsg} %files errmsg -%{_datadir}/%{pkg_name}/errmsg-utf8.txt %{_datadir}/%{pkg_name}/english %lang(cs) %{_datadir}/%{pkg_name}/czech %lang(da) %{_datadir}/%{pkg_name}/danish @@ -1204,8 +1171,10 @@ fi %lang(es) %{_datadir}/%{pkg_name}/spanish %lang(sv) %{_datadir}/%{pkg_name}/swedish %lang(uk) %{_datadir}/%{pkg_name}/ukrainian -%{_datadir}/%{pkg_name}/bulgarian -%{_datadir}/%{pkg_name}/chinese +%lang(bg) %{_datadir}/%{pkg_name}/bulgarian +%lang(zh) %{_datadir}/%{pkg_name}/chinese +%lang(ka) %{_datadir}/%{pkg_name}/georgian +%lang(sw) %{_datadir}/%{pkg_name}/swahili %endif %if %{with galera} @@ -1249,6 +1218,12 @@ fi %config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf %config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset %config(noreplace) %{_sysconfdir}/my.cnf.d/spider.cnf +%config(noreplace) %{_sysconfdir}/my.cnf.d/hashicorp_key_management.cnf +%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lz4.cnf +%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_bzip2.cnf +%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lzma.cnf +%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_lzo.cnf +%config(noreplace) %{_sysconfdir}/my.cnf.d/provider_snappy.cnf %{_sbindir}/mysqld %{_sbindir}/mariadbd @@ -1310,11 +1285,14 @@ fi %{_datadir}/%{pkg_name}/fill_help_tables.sql %{_datadir}/%{pkg_name}/maria_add_gis_sp.sql %{_datadir}/%{pkg_name}/maria_add_gis_sp_bootstrap.sql -%{_datadir}/%{pkg_name}/mysql_system_tables.sql -%{_datadir}/%{pkg_name}/mysql_system_tables_data.sql -%{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql -%{_datadir}/%{pkg_name}/mysql_performance_tables.sql -%{_datadir}/%{pkg_name}/mysql_test_db.sql +%{_datadir}/%{pkg_name}/mariadb_performance_tables.sql +%{_datadir}/%{pkg_name}/mariadb_sys_schema.sql +%{_datadir}/%{pkg_name}/mariadb_system_tables.sql +%{_datadir}/%{pkg_name}/mariadb_system_tables_data.sql +%{_datadir}/%{pkg_name}/mariadb_test_data_timezone.sql +%{_datadir}/%{pkg_name}/mariadb_test_db.sql +%{_datadir}/%{pkg_name}/mini-benchmark + %if %{with mroonga} %{_datadir}/%{pkg_name}/mroonga/install.sql %{_datadir}/%{pkg_name}/mroonga/uninstall.sql @@ -1446,6 +1424,7 @@ fi %{_libdir}/libmysqlclient.so %{_libdir}/libmysqlclient_r.so %{_mandir}/man1/mysql_config* +%{_mandir}/man3/* %endif %endif @@ -1477,6 +1456,9 @@ fi %endif %changelog +* Fri Mar 21 2025 Funda Wang - 4:11.8.1-1 +- update to 11.8.1 (RC) + * Thu Nov 21 2024 Funda Wang - 4:10.5.25-4 - adopt to new cmake macro