.gitignore

@@ -1 +1 @@
-SOURCES/mariadb-10.5.22-downstream_modified.tar.gz
+SOURCES/mariadb-10.3.39.tar.gz

.mariadb.metadata

@@ -1 +1 @@
-d767fc64fbf44da4e1a4174a9939356fac5fe19b SOURCES/mariadb-10.5.22-downstream_modified.tar.gz
+25972d22ed05249782141392f0893e71c7d549a9 SOURCES/mariadb-10.3.39.tar.gz

SOURCES/README.mariadb-docs

@@ -1,9 +0,0 @@
-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

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,101 @@
+--- 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

@@ -0,0 +1,13 @@
+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-logrotate.patch

@@ -26,15 +26,13 @@ Update 6/2018
   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 02/2021
+Update 01/2022
-* Enhance the script as proposed in:
+* added delaycompress option
-  https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux/
+* see https://mariadb.com/kb/en/rotating-logs-on-unix-and-linux
-* Discussion continues in:
-  https://jira.mariadb.org/browse/MDEV-16621
 
---- mariadb-10.5.13-downstream_modified/support-files/mysql-log-rotate.sh	2022-02-22 04:56:35.571185622 +0100
+--- mariadb-10.3.32/support-files/mysql-log-rotate.sh	2022-01-14 17:03:27.000000000 +0100
-+++ mariadb-10.5.13-downstream_modified/support-files/mysql-log-rotate.sh_patched	2022-02-22 04:56:15.121003580 +0100
++++ mariadb-10.3.32/support-files/mysql-log-rotate.sh_patched	2022-01-17 15:07:54.205379672 +0100
-@@ -3,36 +3,23 @@
+@@ -3,36 +3,22 @@
  # in the [mysqld] section as follows:
  #
  # [mysqld]
@@ -65,9 +63,8 @@ Update 02/2021
          missingok
          compress
 +        delaycompress
-+        sharedscripts
      postrotate
- 	# just if mariadbd is really running
+ 	# just if mysqld is really running
 -	if test -x @bindir@/mysqladmin && \
 -	   @bindir@/mysqladmin ping &>/dev/null
 -	then

SOURCES/mariadb-mdev-30402.patch

@@ -0,0 +1,12 @@
+--- 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-ownsetup.patch

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

@@ -0,0 +1,20 @@
+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-scripts.patch

@@ -1,23 +1,22 @@
 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.
 
- # Install libgcc as  mylibgcc.a
+--- mariadb-10.3.8/scripts/CMakeLists.txt	2018-07-02 09:34:11.000000000 +0200
---- mariadb-10.5.5/scripts/CMakeLists.txt.old	2020-09-24 10:13:35.272589689 +0200
++++ mariadb-10.3.8/scripts/CMakeLists.txt_patched	2018-07-03 10:58:15.954670153 +0200
-+++ mariadb-10.5.5/scripts/CMakeLists.txt	2020-09-24 10:17:31.428985798 +0200
+@@ -361,6 +361,34 @@ ELSE()
-@@ -377,6 +377,34 @@
+       COMPONENT ${${file}_COMPONENT}
-       INSTALL_LINK(${file} ${binname} ${INSTALL_BINDIR} ${${file}_COMPONENT})
+      )
-     ENDIF()
    ENDFOREACH()
 +
 +  # files for systemd
 +  SET(SYSTEMD_SCRIPTS
-+    mariadb.tmpfiles.d
++    mysql.tmpfiles.d
 +    mysql.service
 +    mysql@.service
-+    mariadb-prepare-db-dir
++    mysql-prepare-db-dir
-+    mariadb-check-socket
++    mysql-check-socket
-+    mariadb-check-upgrade
++    mysql-check-upgrade
-+    mariadb-scripts-common
++    mysql-scripts-common
 +    mysql_config_multilib
 +    clustercheck
 +    galera_new_cluster

SOURCES/mariadb-ssl-cipher-tests.patch

@@ -1,13 +0,0 @@
-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-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]}`/mariadb-scripts-common"
+source "`dirname ${BASH_SOURCE[0]}`/mysql-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@/mariadb-admin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER --connect-timeout="${CHECKSOCKETTIMEOUT:-10}" ping 2>&1`
+    response=`@bindir@/mysqladmin --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 MariaDB daemon already running with the same unix socket?" >&2
+        echo "Is another MySQL 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/mysql-check-upgrade.sh

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

SOURCES/mysql-prepare-db-dir.sh

@@ -1,9 +1,9 @@
 #!/bin/sh
 
-# This script creates the MariaDB data directory during first service start.
+# This script creates the mysql data directory during first service start.
 # In subsequent starts, it does nothing much.
 
-source "`dirname ${BASH_SOURCE[0]}`/mariadb-scripts-common"
+source "`dirname ${BASH_SOURCE[0]}`/mysql-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@/mariadb-install-db --rpm --datadir="$datadir" --user="$myuser" --skip-test-db >&2
+    @bindir@/mysql_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/mysql-scripts-common.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# Some useful functions used in other MariaDB helper scripts
+# Some useful functions used in other MySQL helper scripts
 # This scripts defines variables datadir, errlogfile, socketfile
 
 export LC_ALL=C
 
-# extract value of a MariaDB option from config files
+# extract value of a MySQL 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, scripts that source
+# For the case of running more instances via systemd, scrits 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 mariadbd-safe will default to
+# Defaults here had better match what mysqld_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 mariadbd daemon or
+#  1) default values are hardcoded in the code of mysqld daemon or
-#     mariadbd-safe script
+#     mysqld_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 mariadbd-safe script and source
+# must correspond with values defined in mysqld_safe script and source
 # code itself.
 
-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"
+server_sections="mysqld_safe mysqld server mysqld-@MAJOR_VERSION@.@MINOR_VERSION@ mariadb mariadb-@MAJOR_VERSION@.@MINOR_VERSION@ client-server"
 
 get_mysql_option "$server_sections" datadir "@MYSQL_DATADIR@"
 datadir="$result"

SOURCES/mysql.service.in

@@ -1,24 +1,32 @@
 # 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:
+# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service",
-#
+# containing
-# root> systemctl edit @DAEMON_NAME@.service
+#	.include /usr/lib/systemd/system/@DAEMON_NAME@.service
-#
+#	...make your changes here...
-# Then add additonal directives under a section (probably [Service]).
+# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf",
+# 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 MariaDB's open-files-limit to 10000,
+# For example, if you want to increase mysql's open-files-limit to 10000,
-# you need to increase systemd's LimitNOFILE setting, use the contents below:
+# you need to increase systemd's LimitNOFILE setting, so create a file named
-#
+# "/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:mariadbd(8)
+Documentation=man:mysqld(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
 
@@ -32,19 +40,20 @@ Type=notify
 User=mysql
 Group=mysql
 
-ExecStartPre=@libexecdir@/mariadb-check-socket
+ExecStartPre=@libexecdir@/mysql-check-socket
 # '%n' expands to 'Full unit name'; man systemd.unit
-ExecStartPre=@libexecdir@/mariadb-prepare-db-dir %n
+ExecStartPre=@libexecdir@/mysql-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@/mariadbd --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
+ExecStart=@libexecdir@/mysqld --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
-ExecStartPost=@libexecdir@/mariadb-check-upgrade
+ExecStartPost=@libexecdir@/mysql-check-upgrade
 
 # Setting this to true can break replication and the Type=notify settings
-# See also bind-address MariaDB option.
+# See also bind-address mysqld option.
 PrivateNetwork=false
 
+KillMode=process
 KillSignal=SIGTERM
 
 # Don't want to see an automated SIGKILL ever

SOURCES/mysql@.service.in

@@ -1,46 +1,39 @@
-# 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 [mariadbd.INSTANCENAME] as sections in
+# To use multi instance variant, use [mysqld.INSTANCENAME] as sections in my.cnf
-# @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, for
+# overwritten during package upgrades.  If you want to customize, the
-# all instances, the best way is:
+# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service",
-#
+# containing
-# root> systemctl edit @DAEMON_NAME@@.service
+#	.include /usr/lib/systemd/system/@DAEMON_NAME@.service
-#
+#	...make your changes here...
-# Then add additonal directives under a section (probably [Service]).
+# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf",
-#
+# which doesn't need to include ".include" call and which will be parsed
-# If you only want to change a specific instance:
+# after the file @DAEMON_NAME@.service itself is parsed.
-#
-# 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 MariaDB's open-files-limit to 10000,
+# For example, if you want to increase mysql's open-files-limit to 10000,
-# you need to increase systemd's LimitNOFILE setting, use the contents below:
+# you need to increase systemd's LimitNOFILE setting, so create a file named
-#
+# "/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:mariadbd(8)
+Documentation=man:mysqld(8)
 Documentation=https://mariadb.com/kb/en/library/systemd/
 After=network.target
 
@@ -54,18 +47,19 @@ Type=notify
 User=mysql
 Group=mysql
 
-ExecStartPre=@libexecdir@/mariadb-check-socket --defaults-group-suffix=.%I
+ExecStartPre=@libexecdir@/mysql-check-socket --defaults-group-suffix=.%I
-ExecStartPre=@libexecdir@/mariadb-prepare-db-dir --defaults-group-suffix=.%I %n
+ExecStartPre=@libexecdir@/mysql-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@/mariadbd --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
+ExecStart=@libexecdir@/mysqld --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
-ExecStartPost=@libexecdir@/mariadb-check-upgrade --defaults-group-suffix=.%I
+ExecStartPost=@libexecdir@/mysql-check-upgrade --defaults-group-suffix=.%I
 
 # Setting this to true can break replication and the Type=notify settings
-# See also bind-address MariaDB option.
+# See also bind-address mysqld option.
 PrivateNetwork=false
 
+KillMode=process
 KillSignal=SIGTERM
 
 # Don't want to see an automated SIGKILL ever

SOURCES/rh-skipped-tests-arm.list

@@ -1,5 +1,3 @@
-# Fails since 10.3.17, only on armv7hl
+# Fails on aarch64
-versioning.partition      :
+innodb.innodb_buffer_pool_resize :
-
+innodb.innodb_buffer_pool_resize_with_chunks :
-# Fail since 10.4.16 only on armv7hl
-versioning.partition_rotation :

SOURCES/rh-skipped-tests-base.list

@@ -1,95 +1,27 @@
-# The SSL test are failing correctly. Fro more explanation, see:
+# Fails everywhere
-# https://jira.mariadb.org/browse/MDEV-8404?focusedCommentId=84275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-84275
+innodb.innodb_defrag_binlog :
-main.ssl_7937                                : #1399847
-main.ssl_8k_key                              :
-main.ssl_crl                                 : #1399847
 
-# ------------------------------
+main.ssl_7937 :
-# Tests that fails because of 'Self Signed Certificate in the Certificate Chain'
+main.ssl_8k_key :
-perfschema.cnf_option                        :
+main.ssl_crl :
+main.ssl_system_ca :
+main.userstat :
 
-rpl.rpl_row_img_blobs                        :
+perfschema.cnf_option :
-rpl.rpl_row_img_eng_min                      :
+perfschema.nesting :
-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                            :
-
-# ------------------------------
-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 since 10.1.12
-innodb.innodb_defrag_binlog                  :
 
-# Fails everywhere since 10.2.15
+rpl.rpl_row_img_blobs :
-main.userstat				     :
+rpl.rpl_row_img_eng_min :
+rpl.rpl_row_img_eng_noblob :
 
-# Fails everywhere since 10.4.11
+sys_vars.slave_parallel_threads_basic :
-main.events_bugs                             :
-sys_vars.tcp_nodelay                         :
 
-# Fails on i686
+# Fails only on i686
-encryption.innodb-redo-badkey                :
+main.myisampack :
 
-# Fails since 10.5.2
+# We don't build the plugin in server; we build it in mariadb-connector-c instead
-main.mysqld--help2                           :
+plugins.auth_ed25519 :
-disks.disks                                  :
-disks.disks_notembedded                      :
-
-# Fails since 10.5.3
-main.mysqld--help-aria                       :
-
-# Fails since 10.5.4
-main.ssl_system_ca                           :
-
-# Fails since 10.5.7
-innodb.innodb_wl6326_big                     :
-plugins.feedback_plugin_load                 :
-
-# Fails only on RHEL 9 BETA on i686 architecture
-main.myisampack                              :
-
-# Fails on all arches since 10.5.13 on CentOS Stream 9
-oqgraph.regression_mdev6345                  :
-type_test.type_test_double                   :
-# Fails only on i686 since 10.5.13 on CentOS Stream 9
-oqgraph.general-innodb                       :
-oqgraph.general-Aria                         :
-oqgraph.general-MyISAM                       :
-oqgraph.legacy_upgrade                       :
-oqgraph.regression_1133093                   :
-oqgraph.regression_1196036                   :
-oqgraph.regression_1213120                   :
-
-# Fails since RHEL 9.0.0 GA
-# TLSv1.0 and TLSv1.1 are not allowed anymore
-# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html-single/security_hardening/index
-main.tls_version1                            :
-
-main.information_schema                         :
-main.loadxml                                    :
-main.lock_kill                                  :
-innodb.innodb_bug51920                          :
-innodb.row_size_error_log_warnings_3            :
-binlog_encryption.rpl_cant_read_event_incident  :
-bg.spider_fixes                                 :
-bugfix.mdev_29904                               :
-sys_vars.completion_type_func                   :
-rpl.rpl_report_port                             :
-rpl.rpl_reset_slave_fail                        :
-rpl.rpl_xa_survive_disconnect_lsu_off           :
-rpl.rpl_heartbeat_basic                         :
-rpl.rpl_xa_survive_disconnect                   :
-rpl.rpl_err_ignoredtable                        :
-rpl.rpl_row_img_sequence_full                   :
-rpl.rpl_row_img_sequence_min                    :
-rpl.rpl_row_img_sequence_noblob                 :
-rpl.rpl_xa_empty_transaction                    :
-rpl.rpl_slave_shutdown_mdev20821                :

SOURCES/rh-skipped-tests-ppc.list

@@ -1,7 +1,30 @@
-# Fails on ppc64le since 10.4.12
+# Fails on ppc64le
-oqgraph.social : 
+parts.partition_alter1_1_innodb :
+parts.partition_alter1_2_innodb : 
+parts.partition_alter1_1_2_innodb :
+parts.partition_alter1_2_1_innodb :
+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 :
 
-# Fails since 10.5.22
+rpl.rpl_loaddata_m :
-innodb.innodb_defrag_concurrent        :
+
-parts.partition_alter4_innodb          :
+#
-rpl.rpl_parallel_optimistic_xa_lsu_off :
+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,3 +1,8 @@
-# Fails since 10.5.2
+# Fails on s390x
-perfschema.memory_aggregate_32bit :
+disks.disks :
-period.overlaps :
+disks.disks_notembedded :
+
+# related to MDEV-20194
+# first check of `undefined` table causes warning,
+# instead INSERT and ALTER should cause it
+innodb.row_size_error_log_warnings_3 :