Import from CS git

.gitignore

@@ -1 +1,2 @@
-SOURCES/mariadb-10.3.39.tar.gz
+SOURCES/fmt-11.0.2.zip
+SOURCES/mariadb-10.11.10.tar.gz

.mariadb.metadata

@@ -1 +1,2 @@
-25972d22ed05249782141392f0893e71c7d549a9 SOURCES/mariadb-10.3.39.tar.gz
+bca4fc0ca0cff346ac2a77a3ae02c415c0e1fce6 SOURCES/fmt-11.0.2.zip
+2c81ce8aa391470435bf613a5c8ee0aa98b8b1b1 SOURCES/mariadb-10.11.10.tar.gz

SOURCES/README.mariadb-docs

@@ -0,0 +1,9 @@
+MariaDB haven't yet made a document package available for offline.
+
+You can create your own copy with the instructions here:
+
+https://mariadb.com/kb/en/meta/mirroring-the-mariadb-knowledge-base/
+
+You can find view the on-line documentation at:
+
+https://mariadb.com/kb/en/documentation/

SOURCES/README.mysql-docs

@@ -1,4 +0,0 @@
-The official MySQL documentation is not freely redistributable, so we cannot
-include it in RHEL or Fedora.  You can find it on-line at
-
-http://dev.mysql.com/doc/

SOURCES/README.mysql-license

@@ -1,9 +0,0 @@
-MySQL is distributed under GPL v2, but there are some licensing exceptions
-that allow the client libraries to be linked with a non-GPL application,
-so long as the application is under a license approved by Oracle.
-For details see
-
-http://www.mysql.com/about/legal/licensing/foss-exception/
-
-Some innobase code from Percona and Google is under BSD license.
-Some code related to test-suite is under LGPLv2.

SOURCES/mariadb-10.3.39-tests.patch

@@ -1,101 +0,0 @@
---- mariadb-10.3.39/mysql-test/include/default_mysqld.cnf	2023-05-03 06:32:44.000000000 +0200
-+++ ../../mariadb-10.3.39/mysql-test/include/default_mysqld.cnf	2023-07-07 13:58:40.255283041 +0200
-@@ -127,3 +127,8 @@ local-infile
- # tables.  Let's enable it in the [server] group, because this group
- # is read after [mysqld] and [embedded]
- loose-aria
-+
-+[mysqltest]
-+loose-ssl-ca=@ENV.MYSQL_TEST_DIR/std_data/cacert.pem
-+loose-ssl-cert=@ENV.MYSQL_TEST_DIR/std_data/server-cert.pem
-+loose-ssl-key=@ENV.MYSQL_TEST_DIR/std_data/server-key.pem
-
---- mariadb-10.3.39/mysql-test/include/wait_until_connected_again.inc	2023-05-03 06:32:44.000000000 +0200
-+++ ../../mariadb-10.3.39/mysql-test/include/wait_until_connected_again.inc	2023-07-07 13:55:30.424368106 +0200
-@@ -11,7 +11,7 @@ let $counter= 5000;
- let $mysql_errno= 9999;
- while ($mysql_errno)
- {
--  --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013
-+  --error 0,ER_SERVER_SHUTDOWN,ER_CONNECTION_KILLED,ER_LOCK_WAIT_TIMEOUT,2002,2006,2013,2026
-   show status;
- 
-   dec $counter;
-
---- mariadb-10.3.39/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test	2023-05-03 06:32:45.000000000 +0200
-+++ ../../mariadb-10.3.39/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test	2023-07-07 13:54:31.152082427 +0200
-@@ -53,7 +53,7 @@ insert into t4 values (3),(4);
- connection master;
- # The get_lock function causes warning for unsafe statement.
- --disable_warnings
----error 0,1317,2013
-+--error 0,1317,2013,2026
- reap;
- --enable_warnings
- connection master1;
-
---- mariadb-10.3.39/mysql-test/suite/innodb/t/innodb_bug51920.test	2023-05-03 06:32:44.000000000 +0200
-+++ ../../mariadb-10.3.39/mysql-test/suite/innodb/t/innodb_bug51920.test	2023-07-07 15:11:39.000404508 +0200
-@@ -36,7 +36,7 @@ let $wait_condition =
- # depending on platform.
- #
- connection con1;
---- error 1317, 2006, 2013, ER_CONNECTION_KILLED
-+-- error 1317, 2006, 2013, 2026, ER_CONNECTION_KILLED
- reap;
- connection default;
- DROP TABLE bug51920;
-
---- mariadb-10.3.39/mysql-test/main/lock_kill.test	2023-05-03 06:32:44.000000000 +0200
-+++ ../../mariadb-10.3.39/mysql-test/main/lock_kill.test	2023-07-07 15:13:54.335086789 +0200
-@@ -17,7 +17,7 @@ LOCK TABLE t1 WRITE;
- eval KILL $conid;
- --enable_query_log
- --connection con1
----error 0,2006,2013,ER_CONNECTION_KILLED
-+--error 0,2006,2013,2026,ER_CONNECTION_KILLED
- reap;
- --connection default
- --disconnect con1
-@@ -35,7 +35,7 @@ LOCK TABLE t1 WRITE, t2 WRITE;
- eval KILL $conid;
- --enable_query_log
- --connection con1
----error 0,2006,2013,ER_CONNECTION_KILLED
-+--error 0,2006,2013,2026,ER_CONNECTION_KILLED
- reap;
- --connection default
- --disconnect con1
-
---- mariadb-10.3.39/mysql-test/main/loadxml.test	2023-05-03 06:32:44.000000000 +0200
-+++ ../../mariadb-10.3.39/mysql-test/main/loadxml.test	2023-07-07 15:15:14.862492763 +0200
-@@ -83,7 +83,7 @@ connection default;
- connection addconroot;
- # Read response from connection to avoid packets out-of-order when disconnecting
- # Note, that connection can already be dead due to previously issued kill
----error 0,2013
-+--error 0,2013,2026
- --reap
- disconnect addconroot;
- connection default;
-
---- mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.test	2023-05-03 06:32:45.000000000 +0200
-+++ ../../mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.test	2023-07-10 11:48:28.859497746 +0200
-@@ -1,3 +1,3 @@
- --replace_regex /varchar\([0-9]+\)/varchar(pathlen)/
- show create table information_schema.disks;
--select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
-+select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
-
---- mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.result	2023-05-03 06:32:45.000000000 +0200
-+++ ../../mariadb-10.3.39/plugin/disks/mysql-test/disks/disks.result	2023-07-10 12:47:10.460233056 +0200
-@@ -7,6 +7,6 @@ DISKS	CREATE TEMPORARY TABLE `DISKS` (
-   `Used` bigint(32) NOT NULL,
-   `Available` bigint(32) NOT NULL
- ) ENGINE=MEMORY DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
--select sum(Total) > sum(Available), sum(Total)>sum(Used) from information_schema.disks;
--sum(Total) > sum(Available)	sum(Total)>sum(Used)
-+select sum(Total) >= sum(Available), sum(Total) >= sum(Used) from information_schema.disks;
-+sum(Total) >= sum(Available)	sum(Total) >= sum(Used)
- 1	1
-

SOURCES/mariadb-annocheck.patch

@@ -1,13 +0,0 @@
-Harden the "hardened" flags even more to comply with RHEL8 security rules
-
---- mariadb-10.3.25/CMakeLists.txt	2020-10-05 18:19:45.000000000 +0200
-+++ mariadb-10.3.25/CMakeLists.txt_patched	2020-11-03 01:29:52.369426705 +0100
-@@ -247,7 +247,7 @@ IF(NOT WITH_TSAN)
-     # security-enhancing flags
-     MY_CHECK_AND_SET_COMPILER_FLAG("-pie -fPIC")
-     MY_CHECK_AND_SET_LINKER_FLAG("-Wl,-z,relro,-z,now")
--    MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector --param=ssp-buffer-size=4")
-+    MY_CHECK_AND_SET_COMPILER_FLAG("-fstack-protector-strong --param=ssp-buffer-size=4")
-     MY_CHECK_AND_SET_COMPILER_FLAG("-D_FORTIFY_SOURCE=2" RELEASE RELWITHDEBINFO)
-   ENDIF()
- ENDIF()

SOURCES/mariadb-check-socket.sh

@@ -5,7 +5,7 @@
 # positive result when starting and mysqld_safe could remove
 # a socket file, which is actually being used by a different daemon.
 
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
+source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
 
 if test -e "$socketfile" ; then
     echo "Socket file $socketfile exists." >&2
@@ -25,9 +25,9 @@ if test -e "$socketfile" ; then
     fi
 
     # some process uses the socket file
-    response=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
+    response=`@bindir@/mariadb-admin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
     if [ $? -eq 0 ] || echo "$response" | grep -q "Access denied for user" ; then
-        echo "Is another MySQL daemon already running with the same unix socket?" >&2
+        echo "Is another MariaDB daemon already running with the same unix socket?" >&2
         echo "Please, stop the process using the socket $socketfile or remove the file manually to start the service." >&2
         exit 1
     fi

SOURCES/mariadb-check-upgrade.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
+source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
 
 upgrade_info_file="$datadir/mysql_upgrade_info"
 version=0
@@ -25,14 +25,14 @@ if [ $version -ne $thisversion ] ; then
     fi
 
     cat <<EOF >&2
-The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool. This can be done using the following steps:
+The datadir located at $datadir needs to be upgraded using 'mariadb-upgrade' tool. This can be done using the following steps:
 
-  1. Back-up your data before with 'mysql_upgrade'
+  1. Back-up your data before with 'mariadb-upgrade'
-  2. Start the database daemon using 'service @DAEMON_NAME@ start'
+  2. Start the database daemon using 'systemctl start @DAEMON_NAME@.service'
-  3. Run 'mysql_upgrade' with a database user that has sufficient privileges
+  3. Run 'mariadb-upgrade' with a database user that has sufficient privileges
 
-Read more about 'mysql_upgrade' usage at:
+Read more about 'mariadb-upgrade' usage at:
-https://mariadb.com/kb/en/mariadb/documentation/sql-commands/table-commands/mysql_upgrade/
+https://mariadb.com/kb/en/mysql_upgrade/
 EOF
 fi
 

SOURCES/mariadb-libfmt.patch

@@ -0,0 +1,31 @@
+MariaDB upstream uses an old version (8.0) of the FMT library, unlike Fedora which packs a current one (10.2)
+  https://src.fedoraproject.org/rpms/fmt
+  https://github.com/MariaDB/server/blob/10.11/cmake/libfmt.cmake#L18
+
+There is a breaking change between the FMT library version 8 and 10.
+Sergei Golubchik from MariaDB upstream noticed that and  decided to not rebase to the newer version for now. In the same commit:
+  https://github.com/MariaDB/server/commit/b5c367cd88e37091ab5f8dab0396c01c97d037e2
+He also fixed the CMake file controlling the FMT library.
+It now correctly detects, whether the system version is able to compile a given code in an expected way.
+
+The incompatibility between FMT library version has been reported both agains Fedora and FMT upstream
+  https://bugzilla.redhat.com/show_bug.cgi?id=2266807
+The upstream created a patch and Fedora backported it
+  https://src.fedoraproject.org/rpms/fmt/c/7d6d6e2c33e845b3cbf3fcaf83f14dfeddfa8a70?branch=rawhide
+but only in F40 and later.
+
+To avoid potential issues on systems with FMT library between 8.0 and the one with the fix backported,
+introduce a bundling mechanism for use on such distributions.
+We pre-download the sources archive and supply the CMake with it, instead of the web URL.
+
+--- mariadb-10.11.10/cmake/libfmt.cmake	2024-10-29 15:32:31.000000000 +0100
++++ mariadb-10.11.10/cmake/libfmt.cmake_patched	2024-11-14 12:06:35.961435488 +0100
+@@ -15,7 +15,7 @@ MACRO(BUNDLE_LIBFMT)
+   ExternalProject_Add(
+     libfmt
+     PREFIX   "${dir}"
+-    URL      "https://github.com/fmtlib/fmt/releases/download/11.0.2/fmt-11.0.2.zip"
++    URL      "file:///${dir}/fmt-11.0.2.zip"
+     URL_MD5 c622dca45ec3fc95254c48370a9f7a1d
+     INSTALL_COMMAND ""
+     CONFIGURE_COMMAND ""

SOURCES/mariadb-logrotate.patch

@@ -1,79 +1,32 @@
-Adjust the mysql-log-rotate script in several ways:
+Adjust the 'mariadb.logrotate.sh' script in several ways:
 
 * Use the correct log file pathname for Red Hat installations.
-* Enable creation of the log file by logrotate (needed since
-  /var/log/ isn't writable by mysql user); and set the same 640
-  permissions we normally use.
-* Comment out the actual rotation commands, so that user must edit
-  the file to enable rotation.  This is unfortunate, but the fact
-  that the script will probably fail without manual configuration
-  (to set a root password) means that we can't really have it turned
-  on by default.  Fortunately, in most configurations the log file
-  is low-volume and so rotation is not critical functionality.
 
-See discussions at RH bugs 799735, 547007
+* Remove Debian specific code
-* Note they are from Fedora 15 / 16
+  for the very unlikely, but possible scenario
+  in which the debian config file would exist.
 
-Update 3/2017
+--- mariadb-10.11.6/support-files/mariadb.logrotate.sh	2023-11-08 16:51:43.000000000 +0100
-* it would be big unexpected change for anyone upgrading, if we start shipping it now.
++++ mariadb-10.11.6/support-files/mariadb.logrotate.sh_patched	2023-12-17 18:03:36.955861025 +0100
-  Maybe it is good candidate for shipping with MariaDB 10.2 ?
+@@ -6,7 +6,7 @@
-* the 'mysqladmin flush logs' doesn´t guarantee, no entries are lost
+ # Read https://mariadb.com/kb/en/error-log/ to learn more about logging and
-  during flushing, the operation is not atomic.
+ # https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/ about rotating logs.
-  We should not ship it in that state
-
-Update 6/2018
-* the SIGHUP causes server to flush all logs. No password admin needed, the only constraint is
-  beeing able to send the SIGHUP to the process and read the mysqld pid file, which root can.
-* Submited as PR: https://github.com/MariaDB/server/pull/807
-
-Update 01/2022
-* added delaycompress option
-* see https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux
-
---- mariadb-10.3.32/support-files/mysql-log-rotate.sh	2022-01-14 17:03:27.000000000 +0100
-+++ mariadb-10.3.32/support-files/mysql-log-rotate.sh_patched	2022-01-17 15:07:54.205379672 +0100
-@@ -3,36 +3,22 @@
- # 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 = <secret> 
--# user= root
--#
--# where "<secret>" is the password. 
--#
--# ATTENTION: This /root/.my.cnf should be readable ONLY
--# for root !
-+# log-error=@LOG_LOCATION@
  
--@localstatedir@/mysqld.log {
+-@localstatedir@/mysqld.log @localstatedir@/mariadb.log @logdir@/*.log {
--        # create 600 mysql mysql
 +@LOG_LOCATION@ {
-+        create 600 mysql mysql
+ 
-         su mysql mysql
+   # Depends on a mysql@localhost unix_socket authenticated user with RELOAD privilege
-         notifempty
+   @su_user@
-         daily
+@@ -45,11 +45,6 @@
-         rotate 3
+   # has thanks to the default use of Unix socket authentication for the 'mysql'
-         missingok
+   # (or root on Debian) account used everywhere since MariaDB 10.4.
-         compress
+   postrotate
-+        delaycompress
+-    if test -r /etc/mysql/debian.cnf
-     postrotate
+-    then
- 	# just if mysqld is really running
+-      EXTRAPARAM='--defaults-file=/etc/mysql/debian.cnf'
--	if test -x @bindir@/mysqladmin && \
+-    fi
--	   @bindir@/mysqladmin ping &>/dev/null
+-
--	then
+     if test -x @bindir@/mariadb-admin
--	   @bindir@/mysqladmin --local flush-error-log \
+     then
--              flush-engine-log flush-general-log flush-slow-log
+       @bindir@/mariadb-admin $EXTRAPARAM --local flush-error-log \
--	fi
+
-+        if [ -e @PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid ]
-+        then
-+           kill -1 $(<@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid)
-+        fi
-     endscript
- }

SOURCES/mariadb-mdev-30402.patch

@@ -1,12 +0,0 @@
---- mariadb-10.3.39/scripts/wsrep_sst_mariabackup.sh	2023-08-11 11:31:40.415022889 +0200
-+++ ../../mariadb-10.3.39/scripts/wsrep_sst_mariabackup.sh	2023-08-11 11:32:01.924161077 +0200
-@@ -340,6 +340,9 @@ get_transfer()
-                         "Use workaround for socat $SOCAT_VERSION bug"
-                 fi
-             fi
-+            if check_for_version "$SOCAT_VERSION" '1.7.4'; then
-+                tcmd="$tcmd,no-sni=1"
-+            fi
-         fi
- 
-         if [ "${sockopt#*,dhparam=}" = "$sockopt" ]; then

SOURCES/mariadb-mtr.patch

@@ -0,0 +1,70 @@
+diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl
+index 594e052a16e..6a274b2d597 100755
+--- a/mysql-test/mariadb-test-run.pl
++++ b/mysql-test/mariadb-test-run.pl
+@@ -1491,7 +1491,6 @@ sub command_line_setup {
+       mtr_warning ("Port base $opt_port_base rounded down to multiple of 10");
+       $opt_port_base-= $rem;
+     }
+-    $opt_build_thread= $opt_port_base / 10 - 1000;
+   }
+ 
+   # --------------------------------------------------------------------------
+@@ -1719,11 +1718,6 @@ sub command_line_setup {
+ # an environment variable can be used to control all ports. A small
+ # number is to be used, 0 - 16 or similar.
+ #
+-# Note the MASTER_MYPORT has to be set the same in all 4.x and 5.x
+-# versions of this script, else a 4.0 test run might conflict with a
+-# 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
+-# all port numbers might not be used in this version of the script.
+-#
+ # Also note the limitation of ports we are allowed to hand out. This
+ # differs between operating systems and configuration, see
+ # http://www.ncftp.com/ncftpd/doc/misc/ephemeral_ports.html
+@@ -1734,10 +1728,14 @@ sub set_build_thread_ports($) {
+ 
+   if ( lc($opt_build_thread) eq 'auto' ) {
+     my $found_free = 0;
+-    $build_thread = 300;	# Start attempts from here
+-    my $build_thread_upper = $build_thread + ($opt_parallel > 1500
+-                                              ? 3000
+-                                              : 2 * $opt_parallel) + 300;
++    if ($opt_port_base eq "auto") {
++      $build_thread = 15000;
++    } else {
++      $build_thread = $opt_port_base;
++    }
++    $build_thread += ($thread - 1) * $opt_port_group_size;
++    my $build_thread_upper = $build_thread + $opt_parallel * 2;
++
+     while (! $found_free)
+     {
+       $build_thread= mtr_get_unique_id($build_thread, $build_thread_upper);
+@@ -1754,7 +1752,7 @@ sub set_build_thread_ports($) {
+   }
+   else
+   {
+-    $build_thread = $opt_build_thread + $thread - 1;
++    $build_thread = $opt_port_base + $thread - 1;
+     if (! check_ports_free($build_thread)) {
+       # Some port was not free(which one has already been printed)
+       mtr_error("Some port(s) was not free")
+@@ -1763,7 +1761,7 @@ sub set_build_thread_ports($) {
+   $ENV{MTR_BUILD_THREAD}= $build_thread;
+ 
+   # Calculate baseport
+-  $baseport= $build_thread * $opt_port_group_size + 10000;
++  $baseport= $build_thread;
+   if ( $baseport < 5001 or $baseport + $opt_port_group_size >= 32767 )
+   {
+     mtr_error("MTR_BUILD_THREAD number results in a port",
+@@ -2968,7 +2966,7 @@ sub kill_leftovers ($) {
+ sub check_ports_free ($)
+ {
+   my $bthread= shift;
+-  my $portbase = $bthread * $opt_port_group_size + 10000;
++  my $portbase = $bthread;
+   for ($portbase..$portbase+($opt_port_group_size-1)){
+     if (mtr_ping_port($_)){
+       mtr_report(" - 'localhost:$_' was not free");

SOURCES/mariadb-ownsetup.patch

@@ -1,16 +1,14 @@
-diff -up mariadb-10.1.8/support-files/CMakeLists.txt.p9 mariadb-10.1.8/support-files/CMakeLists.txt
+--- mariadb-10.4.14/support-files/CMakeLists.txt	2020-08-06 17:28:28.000000000 +0200
---- mariadb-10.2.32/support-files/CMakeLists.txt	2020-05-08 13:45:27.000000000 +0200
++++ mariadb-10.4.14/support-files/CMakeLists.txt_patched	2020-09-03 13:21:07.826658279 +0200
-+++ mariadb-10.2.32/support-files/CMakeLists.txt_pacthed	2020-05-13 10:11:30.884190396 +0200
+@@ -187,6 +187,7 @@ IF(UNIX)
-@@ -100,7 +100,8 @@ IF(UNIX)
+               COMPONENT SharedLibraries)
-   ENDIF()
+       INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
- 
+               COMPONENT Client)
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
++      CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_SOURCE_DIR}/rpm/server.cnf @ONLY)
--  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
+       INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
-+  CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
+               COMPONENT IniFiles)
-+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
+       INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
- 
+
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-   
 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

SOURCES/mariadb-pcdir.patch

@@ -1,20 +0,0 @@
-Use PCDIR CMake option, if configured
-
-Upstream install the server pkgconfig file into arch-independent directory
-Reported to upstream as: https://jira.mariadb.org/browse/MDEV-14340
-
---- mariadb-10.3.12/support-files/CMakeLists.txt	2019-03-20 15:25:53.423283135 +0100
-+++ mariadb-10.3.12/support-files/CMakeLists.txt_patched	2019-03-20 15:38:56.372819958 +0100
-@@ -82,7 +82,12 @@ IF(UNIX)
- 
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
-   CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
-+IF(INSTALL_PCDIR)
-+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_PCDIR} COMPONENT Development)
-+ELSE()
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
-+ENDIF()
-+
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-   

SOURCES/mariadb-prepare-db-dir.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 
-# This script creates the mysql data directory during first service start.
+# This script creates the MariaDB data directory during first service start.
 # In subsequent starts, it does nothing much.
 
-source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
+source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
 
 export LC_ALL=C
 
@@ -97,7 +97,7 @@ if should_initialize "$datadir" ; then
     # https://bugzilla.redhat.com/show_bug.cgi?id=1335849#c19
     INITDB_TIMESTAMP=`LANG=C date -u`
     sleep 1
-    @bindir@/mysql_install_db --rpm --datadir="$datadir" --user="$myuser" --skip-test-db >&2
+    @bindir@/mariadb-install-db --rpm --datadir="$datadir" --user="$myuser" --skip-test-db >&2
     ret=$?
     if [ $ret -ne 0 ] ; then
         echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2

SOURCES/mariadb-scripts-common.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# Some useful functions used in other MySQL helper scripts
+# Some useful functions used in other MariaDB helper scripts
 # This scripts defines variables datadir, errlogfile, socketfile
 
 export LC_ALL=C
 
-# extract value of a MySQL option from config files
+# extract value of a MariaDB option from config files
 # Usage: get_mysql_option VARNAME DEFAULT SECTION [ SECTION, ... ]
 # result is returned in $result
 # We use my_print_defaults which prints all options from multiple files,
@@ -25,7 +25,7 @@ get_mysql_option(){
 	fi
 }
 
-# For the case of running more instances via systemd, scrits that source
+# For the case of running more instances via systemd, scripts that source
 # this file can get --default-group-suffix or similar option as the first
 # argument. The utility my_print_defaults needs to use it as well, so the
 # scripts sourcing this file work with the same options as the daemon.
@@ -35,20 +35,20 @@ while echo "$1" | grep -q '^--defaults' ; do
 	shift
 done
 
-# Defaults here had better match what mysqld_safe will default to
+# Defaults here had better match what mariadbd-safe will default to
 # The option values are generally defined on three important places
 # on the default installation:
-#  1) default values are hardcoded in the code of mysqld daemon or
+#  1) default values are hardcoded in the code of mariadbd daemon or
-#     mysqld_safe script
+#     mariadbd-safe script
 #  2) configurable values are defined in @sysconfdir@/my.cnf
 #  3) default values for helper scripts are specified bellow
 # So, in case values are defined in my.cnf, we need to get that value.
 # In case they are not defined in my.cnf, we need to get the same value
 # in the daemon, as in the helper scripts. Thus, default values here
-# must correspond with values defined in mysqld_safe script and source
+# must correspond with values defined in mariadbd-safe script and source
 # code itself.
 
-server_sections="mysqld_safe mysqld server mysqld-@MAJOR_VERSION@.@MINOR_VERSION@ mariadb mariadb-@MAJOR_VERSION@.@MINOR_VERSION@ client-server"
+server_sections="mysqld_safe mysqld server mysqld-@MAJOR_VERSION@.@MINOR_VERSION@ mariadb mariadb-@MAJOR_VERSION@.@MINOR_VERSION@ mariadbd mariadbd-@MAJOR_VERSION@.@MINOR_VERSION@ client-server galera"
 
 get_mysql_option "$server_sections" datadir "@MYSQL_DATADIR@"
 datadir="$result"

SOURCES/mariadb-scripts.patch

@@ -1,22 +1,23 @@
 We have some downstream patches and other scripts that include variables to
 be expanded by cmake. Cmake needs to know about them, so adding them manually.
 
---- mariadb-10.3.8/scripts/CMakeLists.txt	2018-07-02 09:34:11.000000000 +0200
+ # Install libgcc as  mylibgcc.a
-+++ mariadb-10.3.8/scripts/CMakeLists.txt_patched	2018-07-03 10:58:15.954670153 +0200
+--- mariadb-10.5.5/scripts/CMakeLists.txt.old	2020-09-24 10:13:35.272589689 +0200
-@@ -361,6 +361,34 @@ ELSE()
++++ mariadb-10.5.5/scripts/CMakeLists.txt	2020-09-24 10:17:31.428985798 +0200
-       COMPONENT ${${file}_COMPONENT}
+@@ -377,6 +377,34 @@
-      )
+       INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT})
+     ENDIF()
    ENDFOREACH()
 +
 +  # files for systemd
 +  SET(SYSTEMD_SCRIPTS
-+    mysql.tmpfiles.d
++    mariadb.tmpfiles.d
 +    mysql.service
 +    mysql@.service
-+    mysql-prepare-db-dir
++    mariadb-prepare-db-dir
-+    mysql-check-socket
++    mariadb-check-socket
-+    mysql-check-upgrade
++    mariadb-check-upgrade
-+    mysql-scripts-common
++    mariadb-scripts-common
 +    mysql_config_multilib
 +    clustercheck
 +    galera_new_cluster

SOURCES/mariadb-ssl-cipher-tests.patch

@@ -0,0 +1,13 @@
+diff -up mariadb-10.3.9/mysql-test/main/ssl_cipher.test.fixtest mariadb-10.3.9/mysql-test/main/ssl_cipher.test
+--- mariadb-10.3.13/mysql-test/main/ssl_cipher.test	2019-02-20 08:59:09.000000000 +0100
++++ mariadb-10.3.13/mysql-test/main/ssl_cipher.test_patched	2019-02-22 11:22:01.250256060 +0100
+@@ -97,7 +97,9 @@ drop user mysqltest_1@localhost;
+ let $restart_parameters=--ssl-cipher=AES128-SHA;
+ source include/restart_mysqld.inc;
+ connect (ssl_con,localhost,root,,,,,SSL);
++--replace_regex /TLS_AES_.*/AES128-SHA/
+ SHOW STATUS LIKE 'Ssl_cipher';
++--replace_regex /TLS_AES_.*/AES128-SHA/
+ SHOW STATUS LIKE 'Ssl_cipher_list';
+ disconnect ssl_con;
+ connection default;

SOURCES/mysql.service.in

@@ -1,32 +1,24 @@
 # It's not recommended to modify this file in-place, because it will be
 # overwritten during package upgrades.  If you want to customize, the
-# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service",
+# best way is to:
-# containing
+#
-#	.include /usr/lib/systemd/system/@DAEMON_NAME@.service
+# root> systemctl edit @DAEMON_NAME@.service
-#	...make your changes here...
+#
-# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf",
+# Then add additonal directives under a section (probably [Service]).
-# which doesn't need to include ".include" call and which will be parsed
-# after the file @DAEMON_NAME@.service itself is parsed.
 #
 # For more info about custom unit files, see systemd.unit(5) or
 # http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
-
+#
-# For example, if you want to increase mysql's open-files-limit to 10000,
+# For example, if you want to increase MariaDB's open-files-limit to 10000,
-# you need to increase systemd's LimitNOFILE setting, so create a file named
+# you need to increase systemd's LimitNOFILE setting, use the contents below:
-# "/etc/systemd/system/@DAEMON_NAME@.service.d/limits.conf" containing:
+#
 #	[Service]
 #	LimitNOFILE=10000
-
+#
-# Note: /usr/lib/... is recommended in the .include line though /lib/...
-# still works.
-# Don't forget to reload systemd daemon after you change unit configuration:
-# root> systemctl --system daemon-reload
-
-# Use [mysqld.INSTANCENAME] as sections in my.cnf to configure this instance.
 
 [Unit]
 Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
-Documentation=man:mysqld(8)
+Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
 
@@ -40,20 +32,19 @@ Type=notify
 User=mysql
 Group=mysql
 
-ExecStartPre=@libexecdir@/mysql-check-socket
+ExecStartPre=@libexecdir@/mariadb-check-socket
 # '%n' expands to 'Full unit name'; man systemd.unit
-ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n
+ExecStartPre=@libexecdir@/mariadb-prepare-db-dir %n
 # MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=@libexecdir@/mysqld --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
+ExecStart=@libexecdir@/mariadbd --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
-ExecStartPost=@libexecdir@/mysql-check-upgrade
+ExecStartPost=@libexecdir@/mariadb-check-upgrade
 
 # Setting this to true can break replication and the Type=notify settings
-# See also bind-address mysqld option.
+# See also bind-address MariaDB option.
 PrivateNetwork=false
 
-KillMode=process
 KillSignal=SIGTERM
 
 # Don't want to see an automated SIGKILL ever

SOURCES/mysql@.service.in

@@ -1,39 +1,46 @@
-# Multi instance version of mariadb. For if you run mutiple verions at once.
+# Multi instance version of MariaDB. For if you run mutiple verions at once.
 # Also used for @DAEMON_NAME@@bootstrap to bootstrap Galera.
 #
-# To use multi instance variant, use [mysqld.INSTANCENAME] as sections in my.cnf
+# To use multi instance variant, use [mariadbd.INSTANCENAME] as sections in
+# @sysconfdir@/@my.cnf  to change per instance settings. A minimumal necessary
+# configuration items to change to avoid conflicts between instances is:
+#
+#       [mariadbd.instancename]
+#       # TCP port to make available for clients
+#       port=3306
+#       # Socket to make available for clients
+#       socket=/tmp/mariadb-instancename.sock
+#       # Where MariaDB should store all its data
+#       datadir=/usr/local/mariadb-instancename/data
+#
 # and start the service via:
-#	systemctl start @DAEMON_NAME@@{instancename}.server
+#
+# root> systemctl start @DAEMON_NAME@@{instancename}.server
 #
 # It's not recommended to modify this file in-place, because it will be
-# overwritten during package upgrades.  If you want to customize, the
+# overwritten during package upgrades.  If you want to customize, for
-# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service",
+# all instances, the best way is:
-# containing
+#
-#	.include /usr/lib/systemd/system/@DAEMON_NAME@.service
+# root> systemctl edit @DAEMON_NAME@@.service
-#	...make your changes here...
+#
-# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf",
+# Then add additonal directives under a section (probably [Service]).
-# which doesn't need to include ".include" call and which will be parsed
+#
-# after the file @DAEMON_NAME@.service itself is parsed.
+# If you only want to change a specific instance:
+#
+# root>	systemctl edit @DAEMON_NAME@@{instancename}.server
 #
 # For more info about custom unit files, see systemd.unit(5) or
 # http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
-
+#
-# For example, if you want to increase mysql's open-files-limit to 10000,
+# For example, if you want to increase MariaDB's open-files-limit to 10000,
-# you need to increase systemd's LimitNOFILE setting, so create a file named
+# you need to increase systemd's LimitNOFILE setting, use the contents below:
-# "/etc/systemd/system/@DAEMON_NAME@.service.d/limits.conf" containing:
+#
 #	[Service]
 #	LimitNOFILE=10000
 
-# Note: /usr/lib/... is recommended in the .include line though /lib/...
-# still works.
-# Don't forget to reload systemd daemon after you change unit configuration:
-# root> systemctl --system daemon-reload
-
-# Use [mysqld.INSTANCENAME] as sections in my.cnf to configure this instance.
-
 [Unit]
 Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
-Documentation=man:mysqld(8)
+Documentation=man:mariadbd(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
 
@@ -47,19 +54,18 @@ Type=notify
 User=mysql
 Group=mysql
 
-ExecStartPre=@libexecdir@/mysql-check-socket --defaults-group-suffix=.%I
+ExecStartPre=@libexecdir@/mariadb-check-socket --defaults-group-suffix=.%I
-ExecStartPre=@libexecdir@/mysql-prepare-db-dir --defaults-group-suffix=.%I %n
+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
 # Note: we set --basedir to prevent probes that might trigger SELinux alarms,
 # per bug #547485
-ExecStart=@libexecdir@/mysqld --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
+ExecStart=@libexecdir@/mariadbd --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
-ExecStartPost=@libexecdir@/mysql-check-upgrade --defaults-group-suffix=.%I
+ExecStartPost=@libexecdir@/mariadb-check-upgrade --defaults-group-suffix=.%I
 
 # Setting this to true can break replication and the Type=notify settings
-# See also bind-address mysqld option.
+# See also bind-address MariaDB option.
 PrivateNetwork=false
 
-KillMode=process
 KillSignal=SIGTERM
 
 # Don't want to see an automated SIGKILL ever

SOURCES/rh-skipped-tests-arm.list

@@ -1,3 +1,2 @@
-# Fails on aarch64
+# Fails since 10.11.10
-innodb.innodb_buffer_pool_resize :
+main.mysql_client_test_nonblock :
-innodb.innodb_buffer_pool_resize_with_chunks :

SOURCES/rh-skipped-tests-base.list

@@ -1,27 +1,71 @@
-# Fails everywhere
+# The SSL test are failing correctly. For more explanation, see:
-innodb.innodb_defrag_binlog :
+# https://jira.mariadb.org/browse/MDEV-8404?focusedCommentId=84275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-84275
+main.ssl_7937                                : #1399847
+main.ssl_8k_key                              :
+main.ssl_crl                                 : #1399847
 
-main.ssl_7937 :
+# ------------------------------
-main.ssl_8k_key :
+# Tests that fails because of 'Self Signed Certificate in the Certificate Chain'
-main.ssl_crl :
+perfschema.cnf_option                        :
-main.ssl_system_ca :
-main.userstat :
 
-perfschema.cnf_option :
+rpl.rpl_row_img_blobs                        :
-perfschema.nesting :
+rpl.rpl_row_img_eng_min                      :
+rpl.rpl_row_img_eng_noblob                   :
+
+sys_vars.slave_parallel_threads_basic        :
+
+# ------------------------------
+# Expected to fail, the plugin is not build with server, but 'mariadb-connector-c' instead
+plugins.auth_ed25519                         :
+plugins.multiauth                            :
+main.plugin_auth                             : "ERROR 28000: Plugin mysql_clear_password could not be loaded"
+
+# ------------------------------
+perfschema.nesting                           : #1399847
+perfschema.socket_summary_by_instance_func   : #1399847
 perfschema.socket_summary_by_event_name_func :
-perfschema.socket_summary_by_instance_func :
 
-plugins.feedback_plugin_load :
+# ------------------------------
+# Fails on all architectures since 10.1.12
+innodb.innodb_defrag_binlog                  :
 
-rpl.rpl_row_img_blobs :
+# Fails on all architectures since 10.2.15
-rpl.rpl_row_img_eng_min :
+main.userstat				                 :
-rpl.rpl_row_img_eng_noblob :
 
-sys_vars.slave_parallel_threads_basic :
+# Fails on all architectures since 10.4.11
+sys_vars.tcp_nodelay                         :
 
-# Fails only on i686
+# Fails on all architectures since 10.5.3
-main.myisampack :
+main.mysqld--help-aria                       : "[Warning] You need to use --log-bin to make --binlog-format work."
 
-# We don't build the plugin in server; we build it in mariadb-connector-c instead
+# Fails on all architectures since 10.5.7
-plugins.auth_ed25519 :
+plugins.feedback_plugin_load                 :
+
+# Fails on all architectures since 10.5.13 on CentOS Stream 9
+oqgraph.regression_mdev6345                  :
+
+# Fails on all architectures since 10.5.18
+main.information_schema                      : "mysqltest: At line 1342: query 'reap' failed with wrong errno <Unknown> (2026): 'TLS/SSL error: unexpected eof while reading', instead of <Unknown> (2013)..."
+main.loadxml                                 : "mysqltest: At line 87: query 'reap' failed with wrong errno <Unknown> (2026): 'TLS/SSL error: unexpected eof while reading', instead of  (0)..."
+main.lock_kill                               : "mysqltest: At line 22: query 'reap' failed with wrong errno <Unknown> (2026): 'TLS/SSL error: unexpected eof while reading', instead of  (0)..."
+
+# Fails on all architectures since 10.5.20
+rpl.rpl_err_ignoredtable                     :
+
+# Fails on all architectures since 10.11.6
+binlog_encryption.rpl_gtid_basic             :
+perfschema.threads_mysql                     :
+rpl.rpl_gtid_basic                           :
+rpl.rpl_semi_sync_wait_point                 :
+
+# Fails on all architectures since  10.11.9
+main.mdev375                                 :
+rpl.rpl_get_lock                             :
+perfschema.show_aggregate                    :
+# Unstable on all architectures since 10.11.9
+innodb.log_file_size_online                  :
+
+# Fails on all architectures since  10.11.10
+main.connect                                 :
+main.timezone                                :
+innodb.log_file_name                         :

SOURCES/rh-skipped-tests-ppc.list

@@ -1,30 +1,5 @@
-# Fails on ppc64le
+encryption.innodb_encryption-page-compression :
-parts.partition_alter1_1_innodb :
+encryption.innochecksum :
-parts.partition_alter1_2_innodb : 
+encryption.innodb-checksum-algorithm :
-parts.partition_alter1_1_2_innodb :
+encryption.innodb-discard-import :
-parts.partition_alter1_2_1_innodb :
+innodb.101_compatibility :
-parts.partition_alter2_1_1_innodb : 
-parts.partition_alter1_2_2_innodb : 
-parts.partition_alter2_1_2_innodb : 
-parts.partition_alter2_2_1_innodb : 
-parts.partition_alter2_2_2_innodb : 
-parts.partition_alter4_innodb : 
-parts.partition_basic_innodb :
-parts.part_supported_sql_func_innodb :
-
-rpl.rpl_loaddata_m :
-
-#
-stress.ddl_innodb :
-
-innodb.innodb_buffer_pool_resize :
-innodb.innodb_buffer_pool_resize_with_chunks :
-innodb.innodb_bulk_create_index :
-innodb.innodb_defrag_binlog :
-innodb.innodb_defrag_concurrent :
-innodb_gis.kill_server :
-gcol.innodb_virtual_basic :
-
-# Unstable (randomly failing) tests
-innodb_gis.rtree_search :
-main.type_ranges :

SOURCES/rh-skipped-tests-s390.list

@@ -1,8 +1,12 @@
-# Fails on s390x
+# Fails on 10.11.6
-disks.disks :
+mariabackup.encrypted_page_corruption :
-disks.disks_notembedded :
+mariabackup.huge_lsn :
+mariabackup.xb_file_key_management :
 
-# related to MDEV-20194
+# Fails on 10.11.9
-# first check of `undefined` table causes warning,
+main.having_cond_pushdown :
-# instead INSERT and ALTER should cause it
+innodb.101_compatibility :
-innodb.row_size_error_log_warnings_3 :
+
+mariabackup.slave_provision_nolock :
+mariabackup.page_compression_level :
+mariabackup.xb_page_compress :