import mysql-8.0.21-1.module+el8.2.0+7855+47abd494

.gitignore

+SOURCES/mysql-boost-8.0.21.tar.gz

.mysql.metadata

+fe39b69fa3ae21801efe8e94749696df01f55ddc SOURCES/mysql-boost-8.0.21.tar.gz

SOURCES/README.mysql-docs

+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

+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/boost-1.57.0-mpl-print.patch

+diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp
+--- boost_1_57_0/boost/mpl/print.hpp~	2014-07-09 23:12:31.000000000 +0200
++++ boost_1_57_0/boost/mpl/print.hpp	2015-01-20 12:44:59.621400948 +0100
+@@ -52,16 +52,15 @@ struct print
+     enum { n = sizeof(T) + -1 };
+ #elif defined(__MWERKS__)
+     void f(int);
+-#else 
+-    enum {
+-        n =
+-# if defined(__EDG_VERSION__)
+-           aux::dependent_unsigned<T>::value > -1
+-# else 
+-           sizeof(T) > -1
+-# endif 
+-        };
+-#endif 
++#elif defined(__EDG_VERSION__)
++    enum { n = aux::dependent_unsigned<T>::value > -1 };
++#elif defined(BOOST_GCC)
++    enum { n1 };
++    enum { n2 };
++    enum { n = n1 != n2 };
++#else
++    enum { n = sizeof(T) > -1 };
++#endif
+ };
+ 
+ #if defined(BOOST_MSVC)
+
+Diff finished.  Tue Jan 20 12:45:03 2015

SOURCES/boost-1.58.0-pool.patch

+Index: boost/pool/pool.hpp
+===================================================================
+--- boost/pool/pool.hpp	(revision 78317)
++++ boost/pool/pool.hpp	(revision 78326)
+@@ -27,4 +27,6 @@
+ #include <boost/pool/poolfwd.hpp>
+ 
++// std::numeric_limits
++#include <boost/limits.hpp>
+ // boost::integer::static_lcm
+ #include <boost/integer/common_factor_ct.hpp>
+@@ -358,4 +360,11 @@
+     }
+ 
++    size_type max_chunks() const
++    { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
++      size_type partition_size = alloc_size();
++      size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
++      return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
++    }
++
+     static void * & nextof(void * const ptr)
+     { //! \returns Pointer dereferenced.
+@@ -377,5 +388,7 @@
+       //!   the first time that object needs to allocate system memory.
+       //!   The default is 32. This parameter may not be 0.
+-      //! \param nmax_size is the maximum number of chunks to allocate in one block.
++      //! \param nmax_size is the maximum number of chunks to allocate in one block.			
++      set_next_size(nnext_size);
++      set_max_size(nmax_size);
+     }
+ 
+@@ -400,7 +413,7 @@
+     }
+     void set_next_size(const size_type nnext_size)
+-    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
+-      //! \returns nnext_size.
+-      next_size = start_size = nnext_size;
++    { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.     
++      BOOST_USING_STD_MIN();
++      next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
+     }
+     size_type get_max_size() const
+@@ -410,5 +423,6 @@
+     void set_max_size(const size_type nmax_size)
+     { //! Set max_size.
+-      max_size = nmax_size;
++      BOOST_USING_STD_MIN();
++      max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
+     }
+     size_type get_requested_size() const
+@@ -713,7 +727,7 @@
+   BOOST_USING_STD_MIN();
+   if(!max_size)
+-    next_size <<= 1;
++    set_next_size(next_size << 1);
+   else if( next_size*partition_size/requested_size < max_size)
+-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+ 
+   //  initialize it,
+@@ -753,7 +767,7 @@
+   BOOST_USING_STD_MIN();
+   if(!max_size)
+-    next_size <<= 1;
++    set_next_size(next_size << 1);
+   else if( next_size*partition_size/requested_size < max_size)
+-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+ 
+   //  initialize it,
+@@ -797,4 +811,6 @@
+   //! \returns Address of chunk n if allocated ok.
+   //! \returns 0 if not enough memory for n chunks.
++  if (n > max_chunks())
++    return 0;
+ 
+   const size_type partition_size = alloc_size();
+@@ -845,7 +861,7 @@
+   BOOST_USING_STD_MIN();
+   if(!max_size)
+-    next_size <<= 1;
++    set_next_size(next_size << 1);
+   else if( next_size*partition_size/requested_size < max_size)
+-    next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
++    set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
+ 
+   //  insert it into the list,
+Index: libs/pool/test/test_bug_6701.cpp
+===================================================================
+--- libs/pool/test/test_bug_6701.cpp	(revision 78326)
++++ libs/pool/test/test_bug_6701.cpp	(revision 78326)
+@@ -0,0 +1,27 @@
++/* Copyright (C) 2012 Étienne Dupuis
++* 
++* Use, modification and distribution is subject to the 
++* Boost Software License, Version 1.0. (See accompanying
++* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
++*/
++
++// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
++
++#include <boost/pool/object_pool.hpp>
++#include <boost/limits.hpp>
++
++int main()
++{
++  boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
++
++  void *x = p.malloc();
++  BOOST_ASSERT(!x);
++  
++  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
++  BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
++
++  void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
++  BOOST_ASSERT(!y);
++
++  return 0;
++}

SOURCES/daemon-scl-helper.sh

+#!/bin/sh
+
+# This helper script is necessary for having proper SELinux context of daemon
+# process run in SCL environment via systemd unit file.
+# Without this script the process looses SELinux type because /usr/bin/scl
+# has context bin_t and unit_t -> bin_t results in unconfined process running.
+# If this helper script has the same SELinux context as the original binary,
+# the process will have proper SELinux context.
+#
+# This script was designed to be usable the same as the scl command is used,
+# including the collections given as more arguments, separated from binary
+# itself by -- separator.
+# So it is possible to use the list of collections to be enabled via
+# environment file.
+# Thus, instead of:
+#   /usr/bin/scl enable scl1 scl2 -- /path/to/bin arg1 arg2
+# you can use:
+#   /usr/bin/this-script enable scl1 scl2 -- /path/to/bin arg1 arg2
+#
+# Notice: do not forget to set proper SELinux context for this file.
+# The context should be the same as the binary running has.
+#
+# More information at http://bugzilla.redhat.com/show_bug.cgi?id=1172683
+
+action="$1"
+shift
+
+while [ -n "$1" ] && [ "$1" != "--" ] ; do
+  source scl_source "$action" "$1"
+  shift
+done
+
+if [ $# -le 2 ] ; then
+  echo "Usage `basename $0` enable sclname [sclname ...] -- /path/to/bin [arg ...]" >&2
+  exit 1
+fi
+
+shift
+
+exec "$@"
+
+
+

SOURCES/default-authentication-plugin.cnf

+#
+# MySQL 8.0.4 introduced 'caching_sha2_password' as its default authentication plugin.
+# It is faster and provides better security then the previous default authentication plugin.
+#
+# Until now (09/2018), it does not work with some other software (eg. MariaDB client, MariaDB connectors,  ...)
+#
+# This configuration file changes MySQL default server configuration, so it behaves the same way as in MySQL 5.7.
+#
+# To change the behaviour back to the upstream default, comment out the following lines:
+
+[mysqld]
+default_authentication_plugin=mysql_native_password

SOURCES/my.cnf.in

+#
+# This group is read both both by the client and the server
+# use it for options that affect everything
+#
+[client-server]
+
+#
+# This group is read by the server
+#
+[mysqld]
+
+#
+# include all files from the config directory
+#
+!includedir @SYSCONF2DIR@
+

SOURCES/mysql-5.6.10-rpmlintrc

+# Filtered out until upstream fixes them
+# Upstream bug: http://bugs.mysql.com/68518
+addFilter("incorrect-fsf-address")
+
+# Done to avoid _prefix/lib64/tmpfiles.d
+addFilter("E: hardcoded-library-path in %\{_prefix\}/lib/tmpfiles.d")
+
+# Keeping the old summary for now
+addFilter("W: name-repeated-in-summary C MySQL")
+
+# Spellchecked
+addFilter("W: spelling-error %description -l en_US multi -> mulch, mufti")
+addFilter("W: spelling-error %description -l en_US benchmarking -> bench marking, bench-marking, benchmark")
+addFilter("W: spelling-error Summary(en_US) embeddable -> embedded")
+addFilter("W: spelling-error.*embeddable -> embedded")
+
+# As long as the manual is part of the original tarball, we have do to
+# this
+addFilter("mysql.src: W: invalid-url Source0: mysql-5.6.[0-9]+-nodocs.tar.gz")
+
+# Leave the logfile where it is for now
+addFilter("E: non-root-user-log-file /var/log/mysqld.log mysql")
+addFilter("E: non-root-group-log-file /var/log/mysqld.log mysql")
+addFilter("E: non-ghost-file /var/log/mysqld.log")
+addFilter("E: zero-length /var/log/mysqld.log")
+
+addFilter("E: incoherent-logrotate-file /etc/logrotate.d/mysqld")
+
+# Hidden files and zero lenght files is normal for some tests
+addFilter("W: hidden-file-or-dir /usr/share/mysql-test/std_data/.mylogin.cnf")
+addFilter("E: zero-length /usr/share/mysql-test/suite/parts/t/disabled.def")
+addFilter("E: zero-length /usr/share/mysql-test/std_data/bug37631.MYD")
+addFilter("E: zero-length /usr/share/mysql-test/std_data/cluster_7022_table.MYD")
+addFilter("E: zero-length /usr/share/mysql-test/collections/disabled-weekly.list")
+addFilter("E: zero-length /usr/share/mysql-test/collections/disabled-daily.list")
+
+# debuginfo bug?
+addFilter("E: non-standard-dir-perm /usr/src/debug/tmp 01777")
+
+# mysql-config *script* in lib
+addFilter("W: only-non-binary-in-usr-lib")
+
+# missing
+addFilter("W: no-manual-page-for-binary my_safe_process")
+
+# cluster is gone
+addFilter("W: obsolete-not-provided mysql-cluster")
+

SOURCES/mysql-arm32-timer.patch

+diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
+index 990fe81..c2e1b36 100644
+--- a/mysql-test/include/mtr_warnings.sql
++++ b/mysql-test/include/mtr_warnings.sql
+@@ -292,6 +292,11 @@ INSERT INTO global_suppressions VALUES
+  */
+  ("Channel mysql_main configured to support TLS"),
+ 
++ /*
++   ARM32 don't support timers and get this warning in every test.
++ */
++ ("The CYCLE timer is not available. WAIT events in the performance_schema will not be timed."),
++
+  ("THE_LAST_SUPPRESSION");
+ 
+ 

SOURCES/mysql-chain-certs.patch

+Fix things so that chains of certificates work in the server and client
+certificate files.
+
+This only really works for OpenSSL-based builds, as yassl is unable to read
+multiple certificates from a file.  The patch below to yassl/src/ssl.cpp
+doesn't fix that, but just arranges that the viosslfactories.c patch won't
+have any ill effects in a yassl build.  Since we don't use yassl in Red Hat/
+Fedora builds, I'm not feeling motivated to try to fix yassl for this.
+
+See RH bug #598656.  Filed upstream at http://bugs.mysql.com/bug.php?id=54158
+ 
+diff --git a/vio/viosslfactories.cc b/vio/viosslfactories.cc
+index 5e881e3..2927e7f 100644
+--- a/vio/viosslfactories.cc
++++ b/vio/viosslfactories.cc
+@@ -198,7 +198,7 @@ static int vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file,
+   if (!key_file && cert_file) key_file = cert_file;
+ 
+   if (cert_file &&
+-      SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0) {
++      SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0) {
+     *error = SSL_INITERR_CERT;
+     DBUG_PRINT("error",
+                ("%s from file '%s'", sslGetErrString(*error), cert_file));

SOURCES/mysql-check-socket.sh

+#!/bin/sh
+
+# We check if there is already a process using the socket file,
+# since otherwise the systemd service file could report false
+# 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"
+
+if test -e "$socketfile" ; then
+    echo "Socket file $socketfile exists." >&2
+
+    # no write permissions
+    if ! test -w "$socketfile" ; then
+        echo "Not enough permission to write to the socket file $socketfile, which is suspicious." >&2
+        echo "Please, remove $socketfile manually to start the service." >&2
+        exit 1
+    fi
+
+    # not a socket file
+    if ! test -S "$socketfile" ; then
+        echo "The file $socketfile is not a socket file, which is suspicious." >&2
+        echo "Please, remove $socketfile manually to start the service." >&2
+        exit 1
+    fi
+
+    # some process uses the socket file
+    if fuser "$socketfile" &>/dev/null ; then
+        socketpid=$(fuser "$socketfile" 2>/dev/null)
+        echo "Is another MySQL daemon already running with the same unix socket?" >&2
+        echo "Please, stop the process $socketpid or remove $socketfile manually to start the service." >&2
+        exit 1
+    fi
+
+    # socket file is a garbage
+    echo "No process is using $socketfile, which means it is a garbage, so it will be removed automatically." >&2
+fi
+
+exit 0

SOURCES/mysql-check-upgrade.sh

+#!/bin/sh
+
+source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
+
+upgrade_info_file="$datadir/mysql_upgrade_info"
+version=0
+# get version as integer from mysql_upgrade_info file
+if [ -f "$upgrade_info_file" ] && [ -r "$upgrade_info_file" ] ; then
+    version_major=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\1/')
+    version_minor=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\2/')
+    if [[ $version_major =~ ^[0-9]+$ ]] && [[ $version_minor =~ ^[0-9]+$ ]] ; then
+        version=$((version_major*100+version_minor))
+    fi
+fi
+
+# compute current version as integer
+thisversion=$((@MAJOR_VERSION@*100+@MINOR_VERSION@))
+
+# provide warning in cases we should run mysql_upgrade
+if [ $version -ne $thisversion ] ; then
+
+    # give extra warning if some version seems to be skipped
+    if [ $version -gt 0 ] && [ $version -lt 505 ] ; then
+        echo "The datadir located at $datadir seems to be older than of a version 5.5. Please, mind that as a general rule, to upgrade from one release series to another, go to the next series rather than skipping a series." >&2
+    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:
+
+  1. Back-up your data before with 'mysql_upgrade'
+  2. Start the database daemon using 'service @DAEMON_NAME@ start'
+  3. Run 'mysql_upgrade' with a database user that has sufficient privileges
+
+Read more about 'mysql_upgrade' usage at:
+http://dev.mysql.com/doc/refman/5.6/en/mysql-upgrade.html
+EOF
+fi
+
+exit 0

SOURCES/mysql-file-contents.patch

+Upstream chooses to install INFO_SRC and INFO_BIN into the docs dir, which
+breaks at least two packaging commandments, so we put them into $libdir
+instead.  That means we have to hack the file_contents regression test
+to know about this.
+
+Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
+
+diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
+index 75f8c93..973291c 100644
+--- a/mysql-test/t/file_contents.test
++++ b/mysql-test/t/file_contents.test
+@@ -12,7 +12,7 @@
+ --perl
+ print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
+ $dir_bin = $ENV{'MYSQL_BINDIR'};
+-if ($dir_bin =~ m|^/usr/|) {
++if ($dir_bin =~ m|.*/usr/$|) {
+   # RPM package
+   $dir_docs = $dir_bin;
+   $dir_docs =~ s|/lib|/share/doc|;
+@@ -35,7 +35,7 @@ if ($dir_bin =~ m|^/usr/|) {
+       }
+     }
+   }
+-} elsif ($dir_bin =~ m|/usr$|) {
++} elsif ($dir_bin =~ m|.*/usr$|) {
+   # RPM build during development
+   $dir_docs = "$dir_bin/share/doc";
+   if(-d "$dir_docs/packages") {
+@@ -55,6 +55,15 @@ if ($dir_bin =~ m|^/usr/|) {
+         $dir_docs = glob "$dir_bin/share/mysql-*/docs";
+       }
+     }
++
++    # All the above is entirely wacko, because these files are not docs;
++    # they should be kept in libdir instead.  mtr does not provide a nice
++    # way to find libdir though, so we have to kluge it like this:
++    if (-d "$dir_bin/lib64/mysql") {
++       $dir_docs = "$dir_bin/lib64/mysql";
++    } else {
++       $dir_docs = "$dir_bin/lib/mysql";
++    }
+   }
+ } else {
+   # tar.gz package, Windows, or developer work (in git)

SOURCES/mysql-install-test.patch

+Improve the documentation that will be installed in the mysql-test RPM.
+
+
+diff -Naur mysql-5.5.20.orig/mysql-test/README mysql-5.5.20/mysql-test/README
+--- mysql-5.5.20.orig/mysql-test/README	2011-12-16 14:52:05.000000000 -0500
++++ mysql-5.5.20/mysql-test/README	2012-02-10 17:06:19.531082253 -0500
+@@ -1,14 +1,26 @@
+ This directory contains a test suite for the MySQL daemon. To run
+-the currently existing test cases, simply execute ./mysql-test-run in
+-this directory. It will fire up the newly built mysqld and test it.
++the currently existing test cases, execute ./mysql-test-run in
++this directory.
+ 
+-Note that you do not have to have to do "make install", and you could
+-actually have a co-existing MySQL installation. The tests will not
+-conflict with it.
+-
+-All tests must pass. If one or more of them fail on your system, please
+-read the following manual section for instructions on how to report the
+-problem:
++For use in Red Hat distributions, you should run the script as user mysql,
++so the best bet is something like
++	cd /usr/share/mysql-test
++	sudo -u mysql ./mysql-test-run --skip-test-list=platform-specific-tests.list
++This will use the installed mysql executables, but will run a private copy
++of the server process (using data files within /usr/share/mysql-test),
++so you need not start the mysqld service beforehand.
++
++The "--skip-test-list=platform-specific-tests.list" option excludes tests that are
++known to fail on one or more Red-Hat-supported platforms.  You can omit it
++if you want to check whether such failures occur for you.  Documentation
++about the reasons for omitting such tests can be found in the file
++platform-specific-tests.list.
++
++To clean up afterwards, remove the created "var" subdirectory, eg
++	sudo -u mysql rm -rf /usr/share/mysql-test/var
++
++If one or more tests fail on your system, please read the following manual
++section for instructions on how to report the problem:
+ 
+ http://dev.mysql.com/doc/mysql/en/mysql-test-suite.html
+ 
+@@ -25,7 +37,8 @@
+ 
+ With no test cases named on the command line, mysql-test-run falls back
+ to the normal "non-extern" behavior. The reason for this is that some
+-tests cannot run with an external server.
++tests cannot run with an external server (because they need to control the
++options with which the server is started).
+ 
+ 
+ You can create your own test cases. To create a test case, create a new

SOURCES/mysql-logrotate-log-path.patch

+--- mysql-8.0.11/support-files/mysql-log-rotate.in.old	2018-09-13 18:43:03.595891364 +0200
++++ mysql-8.0.11/support-files/mysql-log-rotate.in	2018-09-13 18:43:36.774236649 +0200
+@@ -41,7 +41,7 @@
+ # ATTENTION: The /root/.my.cnf file should be readable
+ # _ONLY_ by root !
+ 
+-@localstatedir@/mysqld.log {
++@LOG_LOCATION@ {
+         # create 600 mysql mysql
+         notifempty
+         daily

SOURCES/mysql-paths.patch

+Some hard-coded paths make problems when package is built into chroot like
+Software Collections. Removing these hard-coded paths should fix it.
+
+Upstream report: https://mariadb.atlassian.net/browse/MDEV-6485
+
+diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
+index 9f7945d8..6734cdfd 100644
+--- a/cmake/install_layout.cmake
++++ b/cmake/install_layout.cmake
+@@ -105,7 +105,7 @@ IF(UNIX)
+     " Choose between ${VALID_INSTALL_LAYOUTS}" )
+   ENDIF()
+ 
+-  SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc"
++  SET(SYSCONFDIR "/etc"
+     CACHE PATH "config directory (for my.cnf)")
+   MARK_AS_ADVANCED(SYSCONFDIR)
+ ENDIF()
+@@ -189,6 +189,7 @@ SET(INSTALL_SECURE_FILE_PRIVDIR_TARGZ ${secure_file_priv_path})
+ #
+ SET(INSTALL_BINDIR_RPM                  "bin")
+ SET(INSTALL_SBINDIR_RPM                 "sbin")
++SET(INSTALL_SYSCONFDIR_RPM              "/etc")
+ #
+ IF(CMAKE_SYSTEM_PROCESSOR IN_LIST KNOWN_64BIT_ARCHITECTURES)
+   SET(INSTALL_LIBDIR_RPM                "lib64/mysql")
+diff --git a/mysys/my_default.cc b/mysys/my_default.cc
+index 290f1666..8403425f 100644
+--- a/mysys/my_default.cc
++++ b/mysys/my_default.cc
+@@ -1570,12 +1570,12 @@ static const char **init_default_directories(MEM_ROOT *alloc) {
+ 
+ #else
+ 
+-  errors += add_directory(alloc, "/etc/", dirs);
+-  errors += add_directory(alloc, "/etc/mysql/", dirs);
+-
+ #if defined(DEFAULT_SYSCONFDIR)
+   if (DEFAULT_SYSCONFDIR[0])
++  {
+     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
++  }
+ #endif /* DEFAULT_SYSCONFDIR */
+ 
+ #endif
+diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
+index 4149a764..b091d5e2 100644
+--- a/scripts/CMakeLists.txt
++++ b/scripts/CMakeLists.txt
+@@ -288,9 +288,9 @@ IF(UNIX)
+ ENDIF(UNIX)
+ 
+ SET(prefix "${CMAKE_INSTALL_PREFIX}")
+-SET(sysconfdir ${prefix})
++SET(sysconfdir ${SYSCONFDIR})
+ SET(bindir ${prefix}/${INSTALL_BINDIR})
+-SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
++SET(libexecdir ${prefix}/${INSTALL_LIBEXECDIR})
+ SET(datadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
+ SET(libsubdir  ${INSTALL_LIBDIR})
+ SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR})
+diff --git a/scripts/mysqld_multi.pl.in b/scripts/mysqld_multi.pl.in
+index 84dd4d7c..50397ddd 100644
+--- a/scripts/mysqld_multi.pl.in
++++ b/scripts/mysqld_multi.pl.in
+@@ -586,9 +586,7 @@ sub list_defaults_files
+ 
+   my %seen;  # Don't list the same file more than once
+   return grep { defined $_ and not $seen{$_}++ and -f $_ and -r $_ }
+-              ('/etc/my.cnf',
+-               '/etc/mysql/my.cnf',
+-               '@sysconfdir@/my.cnf',
++              ('@sysconfdir@/my.cnf',
+                ($ENV{MYSQL_HOME} ? "$ENV{MYSQL_HOME}/my.cnf" : undef),
+                $opt{'extra-file'},
+                ($ENV{HOME} ? "$ENV{HOME}/.my.cnf" : undef));

SOURCES/mysql-prepare-db-dir.sh

+#!/bin/sh
+
+# This script creates the mysql data directory during first service start.
+# In subsequent starts, it does nothing much.
+#
+# This script is meant to be run as non-root user either during initscript
+# or systemd service execution, before starting the mysqld daemon.
+# Running it as root may have some security risks, because it touches files
+# that can be symlinks pointing to unexpected locations.
+#
+# On the other hand, when using non-standard locations for datadir and logfile,
+# this script might not be able to create the files and the daemon won't start
+# properly. A solution for that is to created the locations for datadir and
+# logfile with correct ownership before starting the daemon.
+