summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Little <scott.little@windriver.com>2018-08-01 14:24:00 -0400
committerScott Little <scott.little@windriver.com>2018-08-01 14:24:03 -0400
commit0287bfa2075bec12441d8baa2c4d03a80862bb12 (patch)
tree3d99d8c244b5009982555d33953fe9f0c7aefc2e
parent850913089d135984e6aaf4caae52039df73356cc (diff)
Relocate mariadb to stx-integ/database/mariadb
Move content from stx-gplv2 into stx-integ Packages will be relocated to stx-integ: base/ bash cgcs-users cluster-resource-agents dpkg haproxy libfdt netpbm rpm database/ mariadb filesystem/ iscsi-initiator-utils filesystem/drbd/ drbd-tools kernel/kernel-modules/ drbd integrity intel-e1000e intel-i40e intel-i40evf intel-ixgbe intel-ixgbevf qat17 tpmdd ldap/ ldapscripts networking/ iptables net-tools Change-Id: I10fbe52d9509b5aa7cc6cad75fdac01814ccc4a9 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
Notes
Notes (review): Code-Review+2: Don Penney <don.penney@windriver.com> Code-Review+2: Saul Wold <sgw@linux.intel.com> Workflow+1: Scott Little <scott.little@windriver.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 02 Aug 2018 19:21:18 +0000 Reviewed-on: https://review.openstack.org/587968 Project: openstack/stx-gplv2 Branch: refs/heads/master
-rw-r--r--centos_pkg_dirs1
-rw-r--r--mariadb/centos/README6
-rw-r--r--mariadb/centos/build_srpm.data4
-rw-r--r--mariadb/centos/files/LICENSE.clustercheck27
-rw-r--r--mariadb/centos/files/README.mysql-cnf13
-rw-r--r--mariadb/centos/files/README.mysql-docs4
-rw-r--r--mariadb/centos/files/README.mysql-license9
-rw-r--r--mariadb/centos/files/clustercheck.sh89
-rw-r--r--mariadb/centos/files/mariadb-admincrash.patch32
-rw-r--r--mariadb/centos/files/mariadb-basedir.patch24
-rw-r--r--mariadb/centos/files/mariadb-errno.patch26
-rw-r--r--mariadb/centos/files/mariadb-example-config-files.patch72
-rw-r--r--mariadb/centos/files/mariadb-file-contents.patch49
-rw-r--r--mariadb/centos/files/mariadb-galera.cnf.patch21
-rw-r--r--mariadb/centos/files/mariadb-install-db-sharedir.patch49
-rw-r--r--mariadb/centos/files/mariadb-install-test.patch62
-rw-r--r--mariadb/centos/files/mariadb-logrotate.patch80
-rw-r--r--mariadb/centos/files/mariadb-notestdb.patch24
-rw-r--r--mariadb/centos/files/mariadb-ownsetup.patch41
-rw-r--r--mariadb/centos/files/mariadb-revert-stdouterr-closing.patch34
-rw-r--r--mariadb/centos/files/mariadb-scripts.patch47
-rw-r--r--mariadb/centos/files/mariadb-server-galera.te23
-rw-r--r--mariadb/centos/files/mariadb-ssl-cypher.patch30
-rw-r--r--mariadb/centos/files/mariadb-strmov.patch40
-rw-r--r--mariadb/centos/files/my.cnf.in18
-rw-r--r--mariadb/centos/files/mysql-check-socket.sh39
-rw-r--r--mariadb/centos/files/mysql-check-upgrade.sh39
-rw-r--r--mariadb/centos/files/mysql-embedded-check.c26
-rw-r--r--mariadb/centos/files/mysql-prepare-db-dir.sh137
-rw-r--r--mariadb/centos/files/mysql-scripts-common.sh58
-rw-r--r--mariadb/centos/files/mysql-wait-ready.sh45
-rw-r--r--mariadb/centos/files/mysql-wait-stop.sh36
-rw-r--r--mariadb/centos/files/mysql.init.in186
-rw-r--r--mariadb/centos/files/mysql.service.in70
-rw-r--r--mariadb/centos/files/mysql.tmpfiles.d.in3
-rw-r--r--mariadb/centos/files/mysql@.service.in77
-rw-r--r--mariadb/centos/files/mysql_config_multilib.sh26
-rw-r--r--mariadb/centos/files/rh-skipped-tests-arm.list8
-rw-r--r--mariadb/centos/files/rh-skipped-tests-base.list9
-rw-r--r--mariadb/centos/files/rh-skipped-tests-ppc-s390.list0
-rw-r--r--mariadb/centos/mariadb.spec2033
-rw-r--r--mariadb/centos/mariadb.spec.unmodified1998
42 files changed, 0 insertions, 5615 deletions
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index d57618a..3457ccc 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,2 +1 @@
1iptables iptables
2mariadb
diff --git a/mariadb/centos/README b/mariadb/centos/README
deleted file mode 100644
index 963b66b..0000000
--- a/mariadb/centos/README
+++ /dev/null
@@ -1,6 +0,0 @@
1The upstream mariadb includes TokuDB source code with AGPL license.
2As AGPL-3.0 is considered a prohibited license by WR, we've modified
3the source tarball to delete the storage/tokudb directory and remove
4the AGPL reference from the EXCEPTIONS-CLIENT Foss License file. The
5spec file has also been modified to compile without tokudb support.
6
diff --git a/mariadb/centos/build_srpm.data b/mariadb/centos/build_srpm.data
deleted file mode 100644
index 4563119..0000000
--- a/mariadb/centos/build_srpm.data
+++ /dev/null
@@ -1,4 +0,0 @@
1COPY_LIST="$CGCS_BASE/downloads/mariadb-10.1.28.tar.gz $PKG_BASE/centos/files/*"
2TIS_PATCH_VER=15
3BUILD_IS_BIG=7
4BUILD_IS_SLOW=19
diff --git a/mariadb/centos/files/LICENSE.clustercheck b/mariadb/centos/files/LICENSE.clustercheck
deleted file mode 100644
index 609015d..0000000
--- a/mariadb/centos/files/LICENSE.clustercheck
+++ /dev/null
@@ -1,27 +0,0 @@
1Copyright (c) 2012-2014, Olaf van Zandwijk
2All rights reserved.
3
4Redistribution and use in source and binary forms, with or without modification,
5are permitted provided that the following conditions are met:
6
71. Redistributions of source code must retain the above copyright notice,
8 this list of conditions and the following disclaimer.
9
102. Redistributions in binary form must reproduce the above copyright notice,
11 this list of conditions and the following disclaimer in the documentation
12 and/or other materials provided with the distribution.
13
143. Neither the name of the copyright holder nor the names of its contributors
15 may be used to endorse or promote products derived from this software without
16 specific prior written permission.
17
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
19ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
22ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
25ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/mariadb/centos/files/README.mysql-cnf b/mariadb/centos/files/README.mysql-cnf
deleted file mode 100644
index 3700c7f..0000000
--- a/mariadb/centos/files/README.mysql-cnf
+++ /dev/null
@@ -1,13 +0,0 @@
1This directory contains prepared configuration files with .cnf extension,
2which provide a configuration for some common MariaDB deployment scenarios.
3These configuration files do not include the default configuration of datadir,
4log-file and pid-file locations, as specified in the default my.cnf file,
5provided in this distribution.
6
7Thus, it is recommended to use these configuration files as an addition to the
8default my.cnf configuration file.
9
10Since default my.cnf contains `!includedir @INSTALL_SYSCONF2DIR@` directive, it is
11recommended to copy required configuration under @INSTALL_SYSCONF2DIR@ directory,
12so the default my.cnf specifications will be extended.
13
diff --git a/mariadb/centos/files/README.mysql-docs b/mariadb/centos/files/README.mysql-docs
deleted file mode 100644
index dd894a7..0000000
--- a/mariadb/centos/files/README.mysql-docs
+++ /dev/null
@@ -1,4 +0,0 @@
1The official MySQL documentation is not freely redistributable, so we cannot
2include it in RHEL or Fedora. You can find it on-line at
3
4http://dev.mysql.com/doc/
diff --git a/mariadb/centos/files/README.mysql-license b/mariadb/centos/files/README.mysql-license
deleted file mode 100644
index ceabbcf..0000000
--- a/mariadb/centos/files/README.mysql-license
+++ /dev/null
@@ -1,9 +0,0 @@
1MySQL is distributed under GPL v2, but there are some licensing exceptions
2that allow the client libraries to be linked with a non-GPL application,
3so long as the application is under a license approved by Oracle.
4For details see
5
6http://www.mysql.com/about/legal/licensing/foss-exception/
7
8Some innobase code from Percona and Google is under BSD license.
9Some code related to test-suite is under LGPLv2.
diff --git a/mariadb/centos/files/clustercheck.sh b/mariadb/centos/files/clustercheck.sh
deleted file mode 100644
index 782dbb6..0000000
--- a/mariadb/centos/files/clustercheck.sh
+++ /dev/null
@@ -1,89 +0,0 @@
1#!/bin/bash
2#
3# Script to make a proxy (ie HAProxy) capable of monitoring Galera cluster nodes properly
4#
5# Author: Olaf van Zandwijk <olaf.vanzandwijk@nedap.com>
6# Author: Raghavendra Prabhu <raghavendra.prabhu@percona.com>
7# Author: Ryan O'Hara <rohara@redhat.com>
8#
9# Documentation and download: https://github.com/olafz/percona-clustercheck
10#
11# Based on the original script from Unai Rodriguez
12#
13
14if [ -f @INSTALL_SYSCONFDIR@/sysconfig/clustercheck ]; then
15 . @INSTALL_SYSCONFDIR@/sysconfig/clustercheck
16fi
17
18MYSQL_USERNAME="${MYSQL_USERNAME-clustercheckuser}"
19MYSQL_PASSWORD="${MYSQL_PASSWORD-clustercheckpassword!}"
20MYSQL_HOST="${MYSQL_HOST:-127.0.0.1}"
21MYSQL_PORT="${MYSQL_PORT:-3306}"
22ERR_FILE="${ERR_FILE:-/dev/null}"
23AVAILABLE_WHEN_DONOR=${AVAILABLE_WHEN_DONOR:-0}
24AVAILABLE_WHEN_READONLY=${AVAILABLE_WHEN_READONLY:-1}
25DEFAULTS_EXTRA_FILE=${DEFAULTS_EXTRA_FILE:-@INSTALL_SYSCONFDIR@/my.cnf}
26
27#Timeout exists for instances where mysqld may be hung
28TIMEOUT=10
29
30if [[ -r $DEFAULTS_EXTRA_FILE ]];then
31 MYSQL_CMDLINE="mysql --defaults-extra-file=$DEFAULTS_EXTRA_FILE -nNE \
32 --connect-timeout=$TIMEOUT \
33 --user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} \
34 --host=${MYSQL_HOST} --port=${MYSQL_PORT}"
35else
36 MYSQL_CMDLINE="mysql -nNE --connect-timeout=$TIMEOUT \
37 --user=${MYSQL_USERNAME} --password=${MYSQL_PASSWORD} \
38 --host=${MYSQL_HOST} --port=${MYSQL_PORT}"
39fi
40#
41# Perform the query to check the wsrep_local_state
42#
43WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state';" \
44 2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
45
46if [[ "${WSREP_STATUS}" == "4" ]] || [[ "${WSREP_STATUS}" == "2" && ${AVAILABLE_WHEN_DONOR} == 1 ]]
47then
48 # Check only when set to 0 to avoid latency in response.
49 if [[ $AVAILABLE_WHEN_READONLY -eq 0 ]];then
50 READ_ONLY=$($MYSQL_CMDLINE -e "SHOW GLOBAL VARIABLES LIKE 'read_only';" \
51 2>${ERR_FILE} | tail -1 2>>${ERR_FILE})
52
53 if [[ "${READ_ONLY}" == "ON" ]];then
54 # Galera cluster node local state is 'Synced', but it is in
55 # read-only mode. The variable AVAILABLE_WHEN_READONLY is set to 0.
56 # => return HTTP 503
57 # Shell return-code is 1
58 echo -en "HTTP/1.1 503 Service Unavailable\r\n"
59 echo -en "Content-Type: text/plain\r\n"
60 echo -en "Connection: close\r\n"
61 echo -en "Content-Length: 35\r\n"
62 echo -en "\r\n"
63 echo -en "Galera cluster node is read-only.\r\n"
64 sleep 0.1
65 exit 1
66 fi
67 fi
68 # Galera cluster node local state is 'Synced' => return HTTP 200
69 # Shell return-code is 0
70 echo -en "HTTP/1.1 200 OK\r\n"
71 echo -en "Content-Type: text/plain\r\n"
72 echo -en "Connection: close\r\n"
73 echo -en "Content-Length: 32\r\n"
74 echo -en "\r\n"
75 echo -en "Galera cluster node is synced.\r\n"
76 sleep 0.1
77 exit 0
78else
79 # Galera cluster node local state is not 'Synced' => return HTTP 503
80 # Shell return-code is 1
81 echo -en "HTTP/1.1 503 Service Unavailable\r\n"
82 echo -en "Content-Type: text/plain\r\n"
83 echo -en "Connection: close\r\n"
84 echo -en "Content-Length: 36\r\n"
85 echo -en "\r\n"
86 echo -en "Galera cluster node is not synced.\r\n"
87 sleep 0.1
88 exit 1
89fi
diff --git a/mariadb/centos/files/mariadb-admincrash.patch b/mariadb/centos/files/mariadb-admincrash.patch
deleted file mode 100644
index cc2b10d..0000000
--- a/mariadb/centos/files/mariadb-admincrash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1mysqladmin crash on execution of below command:
2
3 #> mysqladmin -u root -p
4 ...
5 Segmentation fault (core dumped)
6
7This is probably caused by memory corruption based on working with temp_argv[-1].
8
9RHBZ: #1207041
10Upstream report: https://mariadb.atlassian.net/browse/MDEV-7883
11
12---
13 client/mysqladmin.cc | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc
17index ffdc73f..cb0c558 100644
18--- a/client/mysqladmin.cc
19+++ b/client/mysqladmin.cc
20@@ -1361,7 +1361,8 @@ static char **mask_password(int argc, char ***argv)
21 }
22 argc--;
23 }
24- temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
25+ if (argc >= 0)
26+ temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
27 return(temp_argv);
28 }
29
30--
311.9.1
32
diff --git a/mariadb/centos/files/mariadb-basedir.patch b/mariadb/centos/files/mariadb-basedir.patch
deleted file mode 100644
index d1f4c10..0000000
--- a/mariadb/centos/files/mariadb-basedir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1Don't guess basedir in mysql_config; we place it under _libdir because
2of multilib conflicts, so use rather configured @prefix@ path directly.
3
4---
5 scripts/mysql_config.sh | 3 +--
6 1 file changed, 1 insertion(+), 2 deletions(-)
7
8diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh
9index 52f6d56..df63365 100644
10--- a/scripts/mysql_config.sh
11+++ b/scripts/mysql_config.sh
12@@ -76,8 +76,7 @@ get_full_path ()
13
14 me=`get_full_path $0`
15
16-# Script might have been renamed but assume mysql_<something>config<something>
17-basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'`
18+basedir='@prefix@'
19
20 ldata='@localstatedir@'
21 execdir='@libexecdir@'
22--
231.9.1
24
diff --git a/mariadb/centos/files/mariadb-errno.patch b/mariadb/centos/files/mariadb-errno.patch
deleted file mode 100644
index 5ff34f0..0000000
--- a/mariadb/centos/files/mariadb-errno.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1---
2 include/my_sys.h | 8 +-------
3 1 file changed, 1 insertion(+), 7 deletions(-)
4
5diff --git a/include/my_sys.h b/include/my_sys.h
6index 110a2ee..a90ac5c 100644
7--- a/include/my_sys.h
8+++ b/include/my_sys.h
9@@ -212,13 +212,7 @@
10 #define my_safe_afree(ptr, size) my_afree(ptr)
11 #endif /* HAVE_ALLOCA */
12
13-#ifndef errno /* did we already get it? */
14-#ifdef HAVE_ERRNO_AS_DEFINE
15-#include <errno.h> /* errno is a define */
16-#else
17-extern int errno; /* declare errno */
18-#endif
19-#endif /* #ifndef errno */
20+#include <errno.h> /* errno is a define */
21 extern char *home_dir; /* Home directory for user */
22 extern MYSQL_PLUGIN_IMPORT char *mysql_data_home;
23 extern const char *my_progname; /* program-name (printed in errors) */
24--
251.9.1
26
diff --git a/mariadb/centos/files/mariadb-example-config-files.patch b/mariadb/centos/files/mariadb-example-config-files.patch
deleted file mode 100644
index f29d129..0000000
--- a/mariadb/centos/files/mariadb-example-config-files.patch
+++ /dev/null
@@ -1,72 +0,0 @@
1---
2 support-files/my-huge.cnf.sh | 1 +
3 support-files/my-innodb-heavy-4G.cnf.sh | 2 +-
4 support-files/my-large.cnf.sh | 1 +
5 support-files/my-medium.cnf.sh | 1 +
6 support-files/my-small.cnf.sh | 1 +
7 5 files changed, 5 insertions(+), 1 deletion(-)
8
9diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh
10index 4e08348..d8bf29e 100644
11--- a/support-files/my-huge.cnf.sh
12+++ b/support-files/my-huge.cnf.sh
13@@ -25,6 +25,7 @@ socket = @MYSQL_UNIX_ADDR@
14
15 # The MySQL server
16 [mysqld]
17+log-error = @LOG_LOCATION@
18 port = @MYSQL_TCP_PORT@
19 socket = @MYSQL_UNIX_ADDR@
20 skip-external-locking
21diff --git a/support-files/my-innodb-heavy-4G.cnf.sh b/support-files/my-innodb-heavy-4G.cnf.sh
22index 2590ff5..85fd33a 100644
23--- a/support-files/my-innodb-heavy-4G.cnf.sh
24+++ b/support-files/my-innodb-heavy-4G.cnf.sh
25@@ -42,7 +42,7 @@ socket = @MYSQL_UNIX_ADDR@
26 # The MariaDB server
27 #
28 [mysqld]
29-
30+log-error = @LOG_LOCATION@
31 # generic configuration options
32 port = @MYSQL_TCP_PORT@
33 socket = @MYSQL_UNIX_ADDR@
34diff --git a/support-files/my-large.cnf.sh b/support-files/my-large.cnf.sh
35index 6f8dab0..e8c5f74 100644
36--- a/support-files/my-large.cnf.sh
37+++ b/support-files/my-large.cnf.sh
38@@ -25,6 +25,7 @@ socket = @MYSQL_UNIX_ADDR@
39
40 # The MariaDB server
41 [mysqld]
42+log-error = @LOG_LOCATION@
43 port = @MYSQL_TCP_PORT@
44 socket = @MYSQL_UNIX_ADDR@
45 skip-external-locking
46diff --git a/support-files/my-medium.cnf.sh b/support-files/my-medium.cnf.sh
47index 19ab8df..fc8fc78 100644
48--- a/support-files/my-medium.cnf.sh
49+++ b/support-files/my-medium.cnf.sh
50@@ -26,6 +26,7 @@ socket = @MYSQL_UNIX_ADDR@
51
52 # The MariaDB server
53 [mysqld]
54+log-error = @LOG_LOCATION@
55 port = @MYSQL_TCP_PORT@
56 socket = @MYSQL_UNIX_ADDR@
57 skip-external-locking
58diff --git a/support-files/my-small.cnf.sh b/support-files/my-small.cnf.sh
59index 8c78072..6777431 100644
60--- a/support-files/my-small.cnf.sh
61+++ b/support-files/my-small.cnf.sh
62@@ -24,6 +24,7 @@ socket = @MYSQL_UNIX_ADDR@
63
64 # The MySQL server
65 [mysqld]
66+log-error = @LOG_LOCATION@
67 port = @MYSQL_TCP_PORT@
68 socket = @MYSQL_UNIX_ADDR@
69 skip-external-locking
70--
711.9.1
72
diff --git a/mariadb/centos/files/mariadb-file-contents.patch b/mariadb/centos/files/mariadb-file-contents.patch
deleted file mode 100644
index 5f438fc..0000000
--- a/mariadb/centos/files/mariadb-file-contents.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Upstream chooses to install INFO_SRC and INFO_BIN into the docs dir, which
2breaks at least two packaging commandments, so we put them into $libdir
3instead. That means we have to hack the file_contents regression test
4to know about this.
5
6Recommendation they change is at http://bugs.mysql.com/bug.php?id=61425
7
8---
9 mysql-test/t/file_contents.test | 13 ++++++++++--
10 1 files changed, 11 insertions(+), 2 deletions(-)
11
12diff --git a/mysql-test/t/file_contents.test b/mysql-test/t/file_contents.test
13index 4734a02..a892297 100644
14--- a/mysql-test/t/file_contents.test
15+++ b/mysql-test/t/file_contents.test
16@@ -11,7 +11,7 @@
17 --perl
18 print "\nChecking 'INFO_SRC' and 'INFO_BIN'\n";
19 $dir_bin = $ENV{'MYSQL_BINDIR'};
20-if ($dir_bin eq '/usr/') {
21+if ($dir_bin =~ '.*/usr/$') {
22 # RPM package
23 $dir_docs = $dir_bin;
24 $dir_docs =~ s|/lib|/share/doc|;
25@@ -22,7 +22,7 @@ if ($dir_bin eq '/usr/') {
26 # RedHat: version number in directory name
27 $dir_docs = glob "$dir_docs/MariaDB-server*";
28 }
29-} elsif ($dir_bin eq '/usr') {
30+} elsif ($dir_bin =~ '.*/usr$') {
31 # RPM build during development
32 $dir_docs = "$dir_bin/share/doc";
33 if(-d "$dir_docs/packages") {
34@@ -32,6 +32,15 @@ if ($dir_bin eq '/usr/') {
35 # RedHat/Debian: version number in directory name
36 $dir_docs = glob "$dir_docs/mariadb-server-*";
37 $dir_docs = glob "$dir_docs/MariaDB-server*" unless -d $dir_docs;
38+
39+ # All the above is entirely wacko, because these files are not docs;
40+ # they should be kept in libdir instead. mtr does not provide a nice
41+ # way to find libdir though, so we have to kluge it like this:
42+ if (-d "$dir_bin/lib64/mysql") {
43+ $dir_docs = "$dir_bin/lib64/mysql";
44+ } else {
45+ $dir_docs = "$dir_bin/lib/mysql";
46+ }
47 }
48 # Slackware
49 $dir_docs = glob "$dir_bin/doc/mariadb-[0-9]*" unless -d $dir_docs;
diff --git a/mariadb/centos/files/mariadb-galera.cnf.patch b/mariadb/centos/files/mariadb-galera.cnf.patch
deleted file mode 100644
index e03ee88..0000000
--- a/mariadb/centos/files/mariadb-galera.cnf.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1---
2 support-files/wsrep.cnf.sh | 3 +++
3 1 file changed, 3 insertions(+)
4
5diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh
6index a539085..51ce3dc 100644
7--- a/support-files/wsrep.cnf.sh
8+++ b/support-files/wsrep.cnf.sh
9@@ -30,6 +30,9 @@ bind-address=0.0.0.0
10 ## WSREP options
11 ##
12
13+# Enable wsrep
14+wsrep_on=1
15+
16 # Full path to wsrep provider library or 'none'
17 wsrep_provider=none
18
19--
201.9.1
21
diff --git a/mariadb/centos/files/mariadb-install-db-sharedir.patch b/mariadb/centos/files/mariadb-install-db-sharedir.patch
deleted file mode 100644
index 44dbd6e..0000000
--- a/mariadb/centos/files/mariadb-install-db-sharedir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Use configured value instead of hardcoded path
2
3---
4 scripts/mysql_install_db.pl.in | 2 +-
5 scripts/mysql_install_db.sh | 8 ++++----
6 2 files changed, 5 insertions(+), 5 deletions(-)
7
8diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
9index 9d2c1f6..0accdd1 100644
10--- a/scripts/mysql_install_db.pl.in
11+++ b/scripts/mysql_install_db.pl.in
12@@ -320,7 +320,7 @@ elsif ( $opt->{basedir} )
13 find_in_basedir($opt,"file","mysqld-nt",
14 "bin"); # ,"sql"
15 $srcpkgdatadir = find_in_basedir($opt,"dir","fill_help_tables.sql",
16- "share","share/mysql"); # ,"scripts"
17+ "share","@INSTALL_MYSQLSHAREDIR@"); # ,"scripts"
18 $buildpkgdir = $srcpkgdatadir;
19 $scriptdir = "$opt->{basedir}/scripts";
20 }
21diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
22index 364cc4f..eaa7a89 100644
23--- a/scripts/mysql_install_db.sh
24+++ b/scripts/mysql_install_db.sh
25@@ -311,17 +311,17 @@ then
26 cannot_find_file mysqld $basedir/libexec $basedir/sbin $basedir/bin
27 exit 1
28 fi
29- langdir=`find_in_basedir --dir errmsg.sys share/english share/mysql/english`
30+ langdir=`find_in_basedir --dir errmsg.sys share/english @INSTALL_MYSQLSHAREDIR@/english`
31 if test -z "$langdir"
32 then
33- cannot_find_file errmsg.sys $basedir/share/english $basedir/share/mysql/english
34+ cannot_find_file errmsg.sys $basedir/share/english $basedir/@INSTALL_MYSQLSHAREDIR@/english
35 exit 1
36 fi
37- srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share share/mysql`
38+ srcpkgdatadir=`find_in_basedir --dir fill_help_tables.sql share @INSTALL_MYSQLSHAREDIR@`
39 buildpkgdatadir=$srcpkgdatadir
40 if test -z "$srcpkgdatadir"
41 then
42- cannot_find_file fill_help_tables.sql $basedir/share $basedir/share/mysql
43+ cannot_find_file fill_help_tables.sql $basedir/share $basedir/@INSTALL_MYSQLSHAREDIR@
44 exit 1
45 fi
46 scriptdir="$basedir/scripts"
47--
481.9.1
49
diff --git a/mariadb/centos/files/mariadb-install-test.patch b/mariadb/centos/files/mariadb-install-test.patch
deleted file mode 100644
index 2bbfc47..0000000
--- a/mariadb/centos/files/mariadb-install-test.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1Improve the documentation that will be installed in the mysql-test RPM.
2
3---
4 mysql-test/README | 36 +++++++++++++++++++++++++-----------
5 1 file changed, 25 insertions(+), 11 deletions(-)
6
7diff --git a/mysql-test/README b/mysql-test/README
8index 0fba1cc..2e756e9 100644
9--- a/mysql-test/README
10+++ b/mysql-test/README
11@@ -1,15 +1,28 @@
12-This directory contains a test suite for the MySQL daemon. To run
13-the currently existing test cases, simply execute ./mysql-test-run in
14-this directory. It will fire up the newly built mysqld and test it.
15+This directory contains a test suite for the MariaDB daemon. To run
16+the currently existing test cases, execute ./mysql-test-run in
17+this directory.
18
19-Note that you do not have to have to do "make install", and you could
20-actually have a co-existing MySQL installation. The tests will not
21-conflict with it. To run the test suite in a source directory, you
22-must do make first.
23+For use in Red Hat distributions, you should run the script as user mysql,
24+who is created with nologin shell however, so the best bet is something like
25+ $ su -
26+ # cd /usr/share/mysql-test
27+ # su -s /bin/bash mysql -c "./mysql-test-run --skip-test-list=rh-skipped-tests.list"
28
29-All tests must pass. If one or more of them fail on your system, please
30-read the following manual section for instructions on how to report the
31-problem:
32+This will use the installed mysql executables, but will run a private copy
33+of the server process (using data files within /usr/share/mysql-test),
34+so you need not start the mysqld service beforehand.
35+
36+The "--skip-test-list=rh-skipped-tests.list" option excludes tests that are
37+known to fail on one or more Red-Hat-supported platforms. You can omit it
38+if you want to check whether such failures occur for you. Documentation
39+about the reasons for omitting such tests can be found in the file
40+rh-skipped-tests.list.
41+
42+To clean up afterwards, remove the created "var" subdirectory, eg
43+ # su -s /bin/bash - mysql -c "rm -rf /usr/share/mysql-test/var"
44+
45+If one or more tests fail on your system, please read the following manual
46+section for instructions on how to report the problem:
47
48 https://mariadb.com/kb/en/reporting-bugs
49
50@@ -26,7 +39,8 @@ other relevant options.
51
52 With no test cases named on the command line, mysql-test-run falls back
53 to the normal "non-extern" behavior. The reason for this is that some
54-tests cannot run with an external server.
55+tests cannot run with an external server (because they need to control the
56+options with which the server is started).
57
58 You can create your own test cases. To create a test case, create a new
59 file in the t subdirectory using a text editor. The file should have a .test
60--
611.9.1
62
diff --git a/mariadb/centos/files/mariadb-logrotate.patch b/mariadb/centos/files/mariadb-logrotate.patch
deleted file mode 100644
index e87240c..0000000
--- a/mariadb/centos/files/mariadb-logrotate.patch
+++ /dev/null
@@ -1,80 +0,0 @@
1Adjust the mysql-log-rotate script in several ways:
2
3* Use the correct log file pathname for Red Hat installations.
4* Enable creation of the log file by logrotate (needed since
5 /var/log/ isn't writable by mysql user); and set the same 640
6 permissions we normally use.
7* Comment out the actual rotation commands, so that user must edit
8 the file to enable rotation. This is unfortunate, but the fact
9 that the script will probably fail without manual configuration
10 (to set a root password) means that we can't really have it turned
11 on by default. Fortunately, in most configurations the log file
12 is low-volume and so rotation is not critical functionality.
13
14See discussions at RH bugs 799735, 547007
15
16---
17 support-files/mysql-log-rotate.sh | 44 ++++++++++++++++++++-------------------
18 1 files changed, 23 insertions(+), 21 deletions(-)
19
20diff --git a/support-files/mysql-log-rotate.sh b/support-files/mysql-log-rotate.sh
21index 5d1b30b..425c591 100644
22--- a/support-files/mysql-log-rotate.sh
23+++ b/support-files/mysql-log-rotate.sh
24@@ -1,9 +1,9 @@
25 # This logname can be set in /etc/my.cnf
26-# by setting the variable "err-log"
27-# in the [safe_mysqld] section as follows:
28+# by setting the variable "log-error"
29+# in the [mysqld_safe] section as follows:
30 #
31-# [safe_mysqld]
32-# err-log=@localstatedir@/mysqld.log
33+# [mysqld_safe]
34+# log-error=@LOG_LOCATION@
35 #
36 # If the root user has a password you have to create a
37 # /root/.my.cnf configuration file with the following
38@@ -18,20 +18,22 @@
39 # ATTENTION: This /root/.my.cnf should be readable ONLY
40 # for root !
41
42-@localstatedir@/mysqld.log {
43- # create 600 mysql mysql
44- notifempty
45- daily
46- rotate 3
47- missingok
48- compress
49- postrotate
50- # just if mysqld is really running
51- if test -x @bindir@/mysqladmin && \
52- @bindir@/mysqladmin ping &>/dev/null
53- then
54- @bindir@/mysqladmin --local flush-error-log \
55- flush-engine-log flush-general-log flush-slow-log
56- fi
57- endscript
58-}
59+# Then, un-comment the following lines to enable rotation of mysql's log file:
60+
61+#@LOG_LOCATION@ {
62+# # create 600 mysql mysql
63+# notifempty
64+# daily
65+# rotate 3
66+# missingok
67+# compress
68+# postrotate
69+# # just if mysqld is really running
70+# if test -x @bindir@/mysqladmin && \
71+# @bindir@/mysqladmin ping &>/dev/null
72+# then
73+# @bindir@/mysqladmin --local flush-error-log \
74+# flush-engine-log flush-general-log flush-slow-log
75+# fi
76+# endscript
77+#}
78--
791.9.1
80
diff --git a/mariadb/centos/files/mariadb-notestdb.patch b/mariadb/centos/files/mariadb-notestdb.patch
deleted file mode 100644
index b6ea1f5..0000000
--- a/mariadb/centos/files/mariadb-notestdb.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1---
2 scripts/mysql_install_db.pl.in | 4 ++--
3 1 file changed, 2 insertions(+), 2 deletions(-)
4
5diff --git a/scripts/mysql_install_db.pl.in b/scripts/mysql_install_db.pl.in
6index 0accdd1..3ab2786 100644
7--- a/scripts/mysql_install_db.pl.in
8+++ b/scripts/mysql_install_db.pl.in
9@@ -399,10 +399,10 @@ if ( $opt->{'skip-name-resolve'} and $resolved and $resolved =~ /\s/ )
10 }
11
12 # ----------------------------------------------------------------------
13-# Create database directories mysql & test
14+# Create database directories mysql
15 # ----------------------------------------------------------------------
16
17-foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
18+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql" )
19 {
20 # FIXME not really the same as original "mkdir -p", but ok?
21 mkdir($dir, 0700) unless -d $dir;
22--
231.9.1
24
diff --git a/mariadb/centos/files/mariadb-ownsetup.patch b/mariadb/centos/files/mariadb-ownsetup.patch
deleted file mode 100644
index b54c24a..0000000
--- a/mariadb/centos/files/mariadb-ownsetup.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1---
2 support-files/CMakeLists.txt | 1 +
3 support-files/rpm/server.cnf | 9 +++++++++
4 2 files changed, 10 insertions(+)
5
6diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
7index 71e9b3f..5f3b2a6 100644
8--- a/support-files/CMakeLists.txt
9+++ b/support-files/CMakeLists.txt
10@@ -81,6 +81,7 @@ IF(UNIX)
11 ENDIF()
12
13 CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
14+ CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
15 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
16
17 INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
18diff --git a/support-files/rpm/server.cnf b/support-files/rpm/server.cnf
19index 9682d2b..6f398d4 100644
20--- a/support-files/rpm/server.cnf
21+++ b/support-files/rpm/server.cnf
22@@ -9,7 +9,16 @@
23 [server]
24
25 # this is only for the mysqld standalone daemon
26+# Settings user and group are ignored when systemd is used.
27+# If you need to run mysqld under a different user or group,
28+# customize your systemd unit file for mysqld/mariadb according to the
29+# instructions in http://fedoraproject.org/wiki/Systemd
30 [mysqld]
31+datadir=@MYSQL_DATADIR@
32+socket=@MYSQL_UNIX_ADDR@
33+log-error=@LOG_LOCATION@
34+pid-file=@PID_FILE_DIR@/@DAEMON_NO_PREFIX@.pid
35+
36
37 #
38 # * Galera-related settings
39--
401.9.1
41
diff --git a/mariadb/centos/files/mariadb-revert-stdouterr-closing.patch b/mariadb/centos/files/mariadb-revert-stdouterr-closing.patch
deleted file mode 100644
index 96274c3..0000000
--- a/mariadb/centos/files/mariadb-revert-stdouterr-closing.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1---
2 scripts/mysqld_safe.sh | 2 +-
3 support-files/mysql.server.sh | 2 +-
4 2 files changed, 2 insertions(+), 2 deletions(-)
5
6diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
7index 5564f92..fe77d97 100644
8--- a/scripts/mysqld_safe.sh
9+++ b/scripts/mysqld_safe.sh
10@@ -756,7 +756,7 @@ if [ ! -d $mysql_unix_port_dir ]
11 then
12 if ! `mkdir -p $mysql_unix_port_dir`
13 then
14- log_error "Fatal error Can't create database directory '$mysql_unix_port'"
15+ echo "Fatal error Can't create database directory '$mysql_unix_port'"
16 exit 1
17 fi
18 chown $user $mysql_unix_port_dir
19diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
20index ed0da3c..312f2b2 100644
21--- a/support-files/mysql.server.sh
22+++ b/support-files/mysql.server.sh
23@@ -296,7 +296,7 @@ case "$mode" in
24 then
25 # Give extra arguments to mysqld with the my.cnf file. This script
26 # may be overwritten at next upgrade.
27- $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" &
28+ $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" >dev/null &
29 wait_for_ready; return_value=$?
30
31 # Make lock for RedHat / SuSE
32--
331.9.1
34
diff --git a/mariadb/centos/files/mariadb-scripts.patch b/mariadb/centos/files/mariadb-scripts.patch
deleted file mode 100644
index fe51eb7..0000000
--- a/mariadb/centos/files/mariadb-scripts.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1---
2 scripts/CMakeLists.txt | 29 +++++++++++++++++++++++++++++
3 1 file changed, 29 insertions(+)
4
5diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
6index 2f9c185..a6e4d49 100644
7--- a/scripts/CMakeLists.txt
8+++ b/scripts/CMakeLists.txt
9@@ -362,6 +362,35 @@ ELSE()
10 )
11 ENDFOREACH()
12
13+ # files for systemd
14+ SET(SYSTEMD_SCRIPTS
15+ mysql.tmpfiles.d
16+ mysql.service
17+ mysql@.service
18+ mysql-prepare-db-dir
19+ mysql-wait-ready
20+ mysql-wait-stop
21+ mysql-check-socket
22+ mysql-check-upgrade
23+ mysql-scripts-common
24+ mysql_config_multilib
25+ clustercheck
26+ mysql.init
27+ my.cnf
28+ )
29+ FOREACH(file ${SYSTEMD_SCRIPTS})
30+ IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
31+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
32+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
33+ ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.in)
34+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.in
35+ ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
36+ ELSE()
37+ MESSAGE(FATAL_ERROR "Can not find ${file}.sh or ${file}.in in "
38+ "${CMAKE_CURRENT_SOURCE_DIR}" )
39+ ENDIF()
40+ ENDFOREACH()
41+
42 FOREACH(file ${WSREP_SOURCE})
43 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
44 ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
45--
461.9.1
47
diff --git a/mariadb/centos/files/mariadb-server-galera.te b/mariadb/centos/files/mariadb-server-galera.te
deleted file mode 100644
index bdce127..0000000
--- a/mariadb/centos/files/mariadb-server-galera.te
+++ /dev/null
@@ -1,23 +0,0 @@
1
2module mariadb-server-galera 1.0;
3
4require {
5 type mysqld_t;
6 type rsync_exec_t;
7 type anon_inodefs_t;
8 type proc_net_t;
9 type kerberos_port_t;
10 class file { read execute execute_no_trans getattr open };
11 class tcp_socket { name_bind name_connect };
12 class process { setpgid siginh rlimitinh noatsecure };
13}
14
15# allow mysqld to run rsyncd
16allow mysqld_t self:process setpgid;
17allow mysqld_t rsync_exec_t:file { read execute execute_no_trans getattr open };
18allow mysqld_t anon_inodefs_t:file getattr;
19allow mysqld_t proc_net_t:file { read open };
20
21# allow rsyncd to listen on port 4444
22allow mysqld_t kerberos_port_t:tcp_socket { name_bind name_connect };
23
diff --git a/mariadb/centos/files/mariadb-ssl-cypher.patch b/mariadb/centos/files/mariadb-ssl-cypher.patch
deleted file mode 100644
index 9ff9e02..0000000
--- a/mariadb/centos/files/mariadb-ssl-cypher.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1---
2 mysql-test/r/ssl_8k_key.result | 4 ++--
3 mysql-test/t/ssl_8k_key.test | 2 +-
4 2 files changed, 3 insertions(+), 3 deletions(-)
5
6diff --git a/mysql-test/r/ssl_8k_key.result b/mysql-test/r/ssl_8k_key.result
7index b33a1d2..ff9d0cc 100644
8--- a/mysql-test/r/ssl_8k_key.result
9+++ b/mysql-test/r/ssl_8k_key.result
10@@ -1,2 +1,2 @@
11-Variable_name Value
12-Ssl_cipher DHE-RSA-AES256-SHA
13+have_ssl
14+1
15diff --git a/mysql-test/t/ssl_8k_key.test b/mysql-test/t/ssl_8k_key.test
16index 27cffdc..4b81648 100644
17--- a/mysql-test/t/ssl_8k_key.test
18+++ b/mysql-test/t/ssl_8k_key.test
19@@ -5,7 +5,7 @@
20 #
21 # Bug#29784 YaSSL assertion failure when reading 8k key.
22 #
23---exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SHOW STATUS LIKE 'ssl_Cipher'" 2>&1
24+--exec $MYSQL --ssl --ssl-key=$MYSQL_TEST_DIR/std_data/client-key.pem --ssl-cert=$MYSQL_TEST_DIR/std_data/client-cert.pem -e "SELECT (VARIABLE_VALUE <> '') AS have_ssl FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_cipher'" 2>&1
25
26 ## This test file is for testing encrypted communication only, not other
27 ## encryption routines that the SSL library happens to provide!
28--
291.9.1
30
diff --git a/mariadb/centos/files/mariadb-strmov.patch b/mariadb/centos/files/mariadb-strmov.patch
deleted file mode 100644
index cdd2f8b..0000000
--- a/mariadb/centos/files/mariadb-strmov.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Remove overly optimistic definition of strmov() as stpcpy().
2
3mysql uses this macro with overlapping source and destination strings,
4which is verboten per spec, and fails on some Red Hat platforms.
5Deleting the definition is sufficient to make it fall back to a
6byte-at-a-time copy loop, which should consistently give the
7expected behavior.
8
9Note: the particular case that prompted this patch is reported and fixed
10at http://bugs.mysql.com/bug.php?id=48864. However, my faith in upstream's
11ability to detect this type of error is low, and I also see little evidence
12of any real performance gain from optimizing these calls. So I'm keeping
13this patch.
14
15---
16 include/m_string.h | 8 --------
17 1 file changed, 8 deletions(-)
18
19diff --git a/include/m_string.h b/include/m_string.h
20index 7437ea8..bb3ab57 100644
21--- a/include/m_string.h
22+++ b/include/m_string.h
23@@ -73,14 +73,6 @@
24 extern void *(*my_str_realloc)(void *, size_t);
25 extern void (*my_str_free)(void *);
26
27-#ifdef DBUG_OFF
28-#if defined(HAVE_STPCPY) && MY_GNUC_PREREQ(3, 4) && !defined(__INTEL_COMPILER)
29-#define strmov(A,B) __builtin_stpcpy((A),(B))
30-#elif defined(HAVE_STPCPY)
31-#define strmov(A,B) stpcpy((A),(B))
32-#endif
33-#endif
34-
35 /* Declared in int2str() */
36 extern const char _dig_vec_upper[];
37 extern const char _dig_vec_lower[];
38--
391.9.1
40
diff --git a/mariadb/centos/files/my.cnf.in b/mariadb/centos/files/my.cnf.in
deleted file mode 100644
index 247e12d..0000000
--- a/mariadb/centos/files/my.cnf.in
+++ /dev/null
@@ -1,18 +0,0 @@
1#
2# This group is read both both by the client and the server
3# use it for options that affect everything
4#
5[client-server]
6
7#
8# This group is read by the server
9#
10[mysqld]
11# Disabling symbolic-links is recommended to prevent assorted security risks
12symbolic-links=0
13
14#
15# include all files from the config directory
16#
17!includedir @INSTALL_SYSCONF2DIR@
18
diff --git a/mariadb/centos/files/mysql-check-socket.sh b/mariadb/centos/files/mysql-check-socket.sh
deleted file mode 100644
index b15cd32..0000000
--- a/mariadb/centos/files/mysql-check-socket.sh
+++ /dev/null
@@ -1,39 +0,0 @@
1#!/bin/sh
2
3# We check if there is already a process using the socket file,
4# since otherwise the systemd service file could report false
5# positive result when starting and mysqld_safe could remove
6# a socket file, which is actually being used by a different daemon.
7
8source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
9
10if test -e "$socketfile" ; then
11 echo "Socket file $socketfile exists." >&2
12
13 # no write permissions
14 if ! test -w "$socketfile" ; then
15 echo "Not enough permission to write to the socket file $socketfile, which is suspicious." >&2
16 echo "Please, remove $socketfile manually to start the service." >&2
17 exit 1
18 fi
19
20 # not a socket file
21 if ! test -S "$socketfile" ; then
22 echo "The file $socketfile is not a socket file, which is suspicious." >&2
23 echo "Please, remove $socketfile manually to start the service." >&2
24 exit 1
25 fi
26
27 # some process uses the socket file
28 if fuser "$socketfile" &>/dev/null ; then
29 socketpid=$(fuser "$socketfile" 2>/dev/null)
30 echo "Is another MySQL daemon already running with the same unix socket?" >&2
31 echo "Please, stop the process $socketpid or remove $socketfile manually to start the service." >&2
32 exit 1
33 fi
34
35 # socket file is a garbage
36 echo "No process is using $socketfile, which means it is a garbage, so it will be removed automatically." >&2
37fi
38
39exit 0
diff --git a/mariadb/centos/files/mysql-check-upgrade.sh b/mariadb/centos/files/mysql-check-upgrade.sh
deleted file mode 100644
index 1bfd3bc..0000000
--- a/mariadb/centos/files/mysql-check-upgrade.sh
+++ /dev/null
@@ -1,39 +0,0 @@
1#!/bin/sh
2
3source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
4
5upgrade_info_file="$datadir/mysql_upgrade_info"
6version=0
7# get version as integer from mysql_upgrade_info file
8if [ -f "$upgrade_info_file" ] && [ -r "$upgrade_info_file" ] ; then
9 version_major=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\1/')
10 version_minor=$(cat "$upgrade_info_file" | head -n 1 | sed -e 's/\([0-9]*\)\.\([0-9]*\)\..*$/\2/')
11 if [[ $version_major =~ ^[0-9]+$ ]] && [[ $version_minor =~ ^[0-9]+$ ]] ; then
12 version=$((version_major*100+version_minor))
13 fi
14fi
15
16# compute current version as integer
17thisversion=$((@MAJOR_VERSION@*100+@MINOR_VERSION@))
18
19# provide warning in cases we should run mysql_upgrade
20if [ $version -ne $thisversion ] ; then
21
22 # give extra warning if some version seems to be skipped
23 if [ $version -gt 0 ] && [ $version -lt 505 ] ; then
24 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
25 fi
26
27 cat <<EOF >&2
28The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool. This can be done using the following steps:
29
30 1. Back-up your data before with 'mysql_upgrade'
31 2. Start the database daemon using 'service @DAEMON_NAME@ start'
32 3. Run 'mysql_upgrade' with a database user that has sufficient privileges
33
34Read more about 'mysql_upgrade' usage at:
35https://mariadb.com/kb/en/mariadb/documentation/sql-commands/table-commands/mysql_upgrade/
36EOF
37fi
38
39exit 0
diff --git a/mariadb/centos/files/mysql-embedded-check.c b/mariadb/centos/files/mysql-embedded-check.c
deleted file mode 100644
index 8bf8ca5..0000000
--- a/mariadb/centos/files/mysql-embedded-check.c
+++ /dev/null
@@ -1,26 +0,0 @@
1/* simple test program to see if we can link the embedded server library */
2
3#include <stdio.h>
4#include <stdlib.h>
5#include <stdarg.h>
6
7#include "mysql.h"
8
9MYSQL *mysql;
10
11static char *server_options[] = \
12 { "mysql_test", "--defaults-file=my.cnf", NULL };
13int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
14
15static char *server_groups[] = { "libmysqld_server",
16 "libmysqld_client", NULL };
17
18int main(int argc, char **argv)
19{
20 mysql_library_init(num_elements, server_options, server_groups);
21 mysql = mysql_init(NULL);
22 mysql_close(mysql);
23 mysql_library_end();
24
25 return 0;
26}
diff --git a/mariadb/centos/files/mysql-prepare-db-dir.sh b/mariadb/centos/files/mysql-prepare-db-dir.sh
deleted file mode 100644
index b47fa9b..0000000
--- a/mariadb/centos/files/mysql-prepare-db-dir.sh
+++ /dev/null
@@ -1,137 +0,0 @@
1#!/bin/sh
2
3# This script creates the mysql data directory during first service start.
4# In subsequent starts, it does nothing much.
5
6source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
7
8# Returns content of the specified directory
9# If listing files fails, fake-file is returned so which means
10# we'll behave like there was some data initialized
11# @param <dir> datadir
12ls_check_datadir ()
13{
14 ls -A "$1" 2>/dev/null
15 test $? -eq 0 || echo "fake-file"
16}
17
18# Checks whether datadir should be initialized
19# @param <dir> datadir
20should_initialize ()
21{
22 case `ls_check_datadir "$1"` in
23 ""|lost+found|*.err) true ;;
24 *) false ;;
25 esac
26}
27
28# If two args given first is user, second is group
29# otherwise the arg is the systemd service file
30if [ "$#" -eq 2 ]
31then
32 myuser="$1"
33 mygroup="$2"
34else
35 # Absorb configuration settings from the specified systemd service file,
36 # or the default service if not specified
37 SERVICE_NAME="$1"
38 if [ x"$SERVICE_NAME" = x ]
39 then
40 SERVICE_NAME=@DAEMON_NAME@.service
41 fi
42
43 myuser=`systemctl show -p User "${SERVICE_NAME}" |
44 sed 's/^User=//'`
45 if [ x"$myuser" = x ]
46 then
47 myuser=mysql
48 fi
49
50 mygroup=`systemctl show -p Group "${SERVICE_NAME}" |
51 sed 's/^Group=//'`
52 if [ x"$mygroup" = x ]
53 then
54 mygroup=mysql
55 fi
56fi
57
58# Set up the errlogfile with appropriate permissions
59touch "$errlogfile"
60ret=$?
61# Provide some advice if the log file cannot be touched
62if [ $ret -ne 0 ] ; then
63 errlogdir=$(dirname $errlogfile)
64 if ! [ -d "$errlogdir" ] ; then
65 echo "The directory $errlogdir does not exist."
66 elif [ -f "$errlogfile" ] ; then
67 echo "The log file $errlogfile cannot be touched, please, fix its permissions."
68 else
69 echo "The log file $errlogfile could not be created."
70 fi
71 echo "The daemon will be run under $myuser:$mygroup"
72 exit 1
73fi
74chown "$myuser:$mygroup" "$errlogfile"
75chmod 0640 "$errlogfile"
76[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
77
78# Make the data directory if doesn't exist or empty
79if should_initialize "$datadir" ; then
80 # First, make sure $datadir is there with correct permissions
81 # (note: if it's not, and we're not root, this'll fail ...)
82 if [ ! -e "$datadir" -a ! -h "$datadir" ]
83 then
84 mkdir -p "$datadir" || exit 1
85 fi
86 chown "$myuser:$mygroup" "$datadir"
87 chmod 0755 "$datadir"
88 [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
89
90 # Now create the database
91 echo "Initializing @NICE_PROJECT_NAME@ database"
92 # Avoiding deletion of files not created by mysql_install_db is
93 # guarded by time check and sleep should help work-arounded
94 # potential issues on systems with 1 second resolution timestamps
95 # https://bugzilla.redhat.com/show_bug.cgi?id=1335849#c19
96 INITDB_TIMESTAMP=`LANG=C date -u`
97 sleep 1
98 @bindir@/mysql_install_db --rpm --datadir="$datadir" --user="$myuser"
99 ret=$?
100 if [ $ret -ne 0 ] ; then
101 echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2
102 echo "Perhaps @sysconfdir@/my.cnf is misconfigured or there is some problem with permissions of $datadir." >&2
103 # Clean up any partially-created database files
104 if [ ! -e "$datadir/mysql/user.frm" ] && [ -d "$datadir" ] ; then
105 echo "Initialization of @NICE_PROJECT_NAME@ database was not finished successfully." >&2
106 echo "Files created so far will be removed." >&2
107 find "$datadir" -mindepth 1 -maxdepth 1 -newermt "$INITDB_TIMESTAMP" \
108 -not -name "lost+found" -exec rm -rf {} +
109 if [ $? -ne 0 ] ; then
110 echo "Removing of created files was not successfull." >&2
111 echo "Please, clean directory $datadir manually." >&2
112 fi
113 else
114 echo "However, part of data has been initialized and those will not be removed." >&2
115 echo "Please, clean directory $datadir manually." >&2
116 fi
117 exit $ret
118 fi
119 # upgrade does not need to be run on a fresh datadir
120 echo "@VERSION@-MariaDB" >"$datadir/mysql_upgrade_info"
121 # In case we're running as root, make sure files are owned properly
122 chown -R "$myuser:$mygroup" "$datadir"
123else
124 if [ -d "$datadir/mysql/" ] ; then
125 # mysql dir exists, it seems data are initialized properly
126 echo "Database @NICE_PROJECT_NAME@ is probably initialized in $datadir already, nothing is done."
127 echo "If this is not the case, make sure the $datadir is empty before running `basename $0`."
128 else
129 # if the directory is not empty but mysql/ directory is missing, then
130 # print error and let user to initialize manually or empty the directory
131 echo "Database @NICE_PROJECT_NAME@ is not initialized, but the directory $datadir is not empty, so initialization cannot be done."
132 echo "Make sure the $datadir is empty before running `basename $0`."
133 exit 1
134 fi
135fi
136
137exit 0
diff --git a/mariadb/centos/files/mysql-scripts-common.sh b/mariadb/centos/files/mysql-scripts-common.sh
deleted file mode 100644
index bf2888f..0000000
--- a/mariadb/centos/files/mysql-scripts-common.sh
+++ /dev/null
@@ -1,58 +0,0 @@
1#!/bin/sh
2
3# Some useful functions used in other MySQL helper scripts
4# This scripts defines variables datadir, errlogfile, socketfile
5
6export LC_ALL=C
7
8# extract value of a MySQL option from config files
9# Usage: get_mysql_option VARNAME DEFAULT SECTION [ SECTION, ... ]
10# result is returned in $result
11# We use my_print_defaults which prints all options from multiple files,
12# with the more specific ones later; hence take the last match.
13get_mysql_option(){
14 if [ $# -ne 3 ] ; then
15 echo "get_mysql_option requires 3 arguments: section option default_value"
16 return
17 fi
18 sections="$1"
19 option_name="$2"
20 default_value="$3"
21 result=`@bindir@/my_print_defaults $sections | sed -n "s/^--${option_name}=//p" | tail -n 1`
22 if [ -z "$result" ]; then
23 # not found, use default
24 result="${default_value}"
25 fi
26}
27
28# Defaults here had better match what mysqld_safe will default to
29# The option values are generally defined on three important places
30# on the default installation:
31# 1) default values are hardcoded in the code of mysqld daemon or
32# mysqld_safe script
33# 2) configurable values are defined in @sysconfdir@/my.cnf
34# 3) default values for helper scripts are specified bellow
35# So, in case values are defined in my.cnf, we need to get that value.
36# In case they are not defined in my.cnf, we need to get the same value
37# in the daemon, as in the helper scripts. Thus, default values here
38# must correspond with values defined in mysqld_safe script and source
39# code itself.
40
41server_sections="mysqld_safe mysqld server mysqld-@MAJOR_VERSION@.@MINOR_VERSION@ mariadb mariadb-@MAJOR_VERSION@.@MINOR_VERSION@ client-server"
42
43get_mysql_option "$server_sections" datadir "@MYSQL_DATADIR@"
44datadir="$result"
45
46# if there is log_error in the my.cnf, my_print_defaults still
47# returns log-error
48# log-error might be defined in mysqld_safe and mysqld sections,
49# the former has bigger priority
50get_mysql_option "$server_sections" log-error "$datadir/`uname -n`.err"
51errlogfile="$result"
52
53get_mysql_option "$server_sections" socket "@MYSQL_UNIX_ADDR@"
54socketfile="$result"
55
56get_mysql_option "$server_sections" pid-file "$datadir/`uname -n`.pid"
57pidfile="$result"
58
diff --git a/mariadb/centos/files/mysql-wait-ready.sh b/mariadb/centos/files/mysql-wait-ready.sh
deleted file mode 100644
index 2ed5fe1..0000000
--- a/mariadb/centos/files/mysql-wait-ready.sh
+++ /dev/null
@@ -1,45 +0,0 @@
1#!/bin/sh
2
3source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
4
5# This script waits for mysqld to be ready to accept connections
6# (which can be many seconds or even minutes after launch, if there's
7# a lot of crash-recovery work to do).
8# Running this as ExecStartPost is useful so that services declared as
9# "After mysqld" won't be started until the database is really ready.
10
11if [ $# -ne 1 ] ; then
12 echo "You need to pass daemon pid as an argument for this script."
13 exit 20
14fi
15
16# Service file passes us the daemon's PID (actually, mysqld_safe's PID)
17daemon_pid="$1"
18
19# Wait for the server to come up or for the mysqld process to disappear
20ret=0
21while /bin/true; do
22 # Check process still exists
23 if ! [ -d "/proc/${daemon_pid}" ] ; then
24 ret=1
25 break
26 fi
27 RESPONSE=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
28 mret=$?
29 if [ $mret -eq 0 ] ; then
30 break
31 fi
32 # exit codes 1, 11 (EXIT_CANNOT_CONNECT_TO_SERVICE) are expected,
33 # anything else suggests a configuration error
34 if [ $mret -ne 1 -a $mret -ne 11 ]; then
35 echo "Cannot check for @NICE_PROJECT_NAME@ Daemon startup because of mysqladmin failure." >&2
36 ret=$mret
37 break
38 fi
39 # "Access denied" also means the server is alive
40 echo "$RESPONSE" | grep -q "Access denied for user" && break
41
42 sleep 1
43done
44
45exit $ret
diff --git a/mariadb/centos/files/mysql-wait-stop.sh b/mariadb/centos/files/mysql-wait-stop.sh
deleted file mode 100644
index 62bde30..0000000
--- a/mariadb/centos/files/mysql-wait-stop.sh
+++ /dev/null
@@ -1,36 +0,0 @@
1#!/bin/sh
2
3source "`dirname ${BASH_SOURCE[0]}`/mysql-scripts-common"
4
5# This script waits for mysqld to be properly stopped
6# (which can be many seconds in some large load).
7# Running this as ExecStopPost is useful so that starting which is done
8# as part of restart doesn't see the former process still running.
9
10# Wait for the server to properly end the main server
11ret=0
12TIMEOUT=60
13SECONDS=0
14
15if ! [ -f "$pidfile" ]; then
16 exit 0
17fi
18
19MYSQLPID=`cat "$pidfile" 2>/dev/null`
20if [ -z "$MYSQLPID" ] ; then
21 exit 2
22fi
23
24while /bin/true; do
25 # Check process still exists
26 if ! [ -d "/proc/${MYSQLPID}" ] ; then
27 break
28 fi
29 if [ $SECONDS -gt $TIMEOUT ] ; then
30 ret=3
31 break
32 fi
33 sleep 1
34done
35
36exit $ret
diff --git a/mariadb/centos/files/mysql.init.in b/mariadb/centos/files/mysql.init.in
deleted file mode 100644
index 0a022af..0000000
--- a/mariadb/centos/files/mysql.init.in
+++ /dev/null
@@ -1,186 +0,0 @@
1#!/bin/sh
2#
3# @DAEMON_NAME@ This shell script takes care of starting and stopping
4# the MySQL subsystem (mysqld).
5#
6# chkconfig: - 64 36
7# description: MySQL database server.
8# processname: mysqld
9# config: @sysconfdir@/my.cnf
10# pidfile: /var/run/@DAEMON_NAME@/@DAEMON_NAME@.pid
11### BEGIN INIT INFO
12# Provides: mysqld
13# Required-Start: $local_fs $remote_fs $network $named $syslog $time
14# Required-Stop: $local_fs $remote_fs $network $named $syslog $time
15# Short-Description: start and stop MySQL server
16# Description: MySQL database server
17### END INIT INFO
18
19# Source function library.
20. /etc/rc.d/init.d/functions
21
22# Source networking configuration.
23. /etc/sysconfig/network
24
25
26exec="@bindir@/mysqld_safe"
27prog="@DAEMON_NAME@"
28
29# Set timeouts here so they can be overridden from @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@
30STARTTIMEOUT=300
31STOPTIMEOUT=60
32
33# User and group the daemon will run under
34MYUSER=mysql
35MYGROUP=mysql
36
37# Edit the following file in order to re-write some of the environment
38# variables defined above, like $STARTTIMEOUT, $STOPTIMEOUT, $exec
39[ -e @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@ ] && . @sysconfdir@/sysconfig/@DAEMON_NO_PREFIX@
40
41lockfile=/var/lock/subsys/$prog
42
43# get options from my.cnf
44source "@libexecdir@/mysql-scripts-common"
45
46start(){
47 [ -x $exec ] || exit 5
48
49 # check permissions
50 if ! touch $(dirname $socketfile) &>/dev/null ; then
51 action $"Starting $prog: " /bin/false
52 return 4
53 fi
54
55 # check to see if it's already running
56 MYSQLDRUNNING=0
57 if [ -f "$pidfile" ]; then
58 MYSQLPID=`cat "$pidfile" 2>/dev/null`
59 if [ -n "$MYSQLPID" ] && [ -d "/proc/$MYSQLPID" ] ; then
60 MYSQLDRUNNING=1
61 fi
62 fi
63 RESPONSE=`@bindir@/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
64 if [ $MYSQLDRUNNING = 1 ] && [ $? = 0 ]; then
65 # already running, do nothing
66 action $"Starting $prog: " /bin/true
67 ret=0
68 elif [ $MYSQLDRUNNING = 1 ] && echo "$RESPONSE" | grep -q "Access denied for user"
69 then
70 # already running, do nothing
71 action $"Starting $prog: " /bin/true
72 ret=0
73 else
74 @libexecdir@/mysql-prepare-db-dir $MYUSER $MYGROUP || return 4
75 @libexecdir@/mysql-check-socket || return 1
76
77 # Pass all the options determined above, to ensure consistent behavior.
78 # In many cases mysqld_safe would arrive at the same conclusions anyway
79 # but we need to be sure. (An exception is that we don't force the
80 # log-error setting, since this script doesn't really depend on that,
81 # and some users might prefer to configure logging to syslog.)
82 # Note: set --basedir to prevent probes that might trigger SELinux
83 # alarms, per bug #547485
84 $exec --datadir="$datadir" --socket="$socketfile" \
85 --pid-file="$pidfile" \
86 --basedir=@prefix@ --user=$MYUSER >/dev/null 2>&1 &
87 safe_pid=$!
88
89 # Wait until the daemon is up
90 @libexecdir@/mysql-wait-ready "$safe_pid"
91 ret=$?
92
93 if [ $ret -eq 0 ]; then
94 action $"Starting $prog: " /bin/true
95 chmod o+r $pidfile >/dev/null 2>&1
96 touch $lockfile
97 else
98 action $"Starting $prog: " /bin/false
99 fi
100 fi
101 return $ret
102}
103
104stop(){
105 if [ ! -f "$pidfile" ]; then
106 # not running; per LSB standards this is "ok"
107 action $"Stopping $prog: " /bin/true
108 return 0
109 fi
110 MYSQLPID=`cat "$pidfile" 2>/dev/null`
111 if [ -n "$MYSQLPID" ]; then
112 if ! [ -d "/proc/$MYSQLPID" ] ; then
113 # process doesn't run anymore
114 action $"Stopping $prog: " /bin/true
115 return 0
116 fi
117 /bin/kill "$MYSQLPID" >/dev/null 2>&1
118 ret=$?
119 if [ $ret -eq 0 ]; then
120 TIMEOUT="$STOPTIMEOUT"
121 while [ $TIMEOUT -gt 0 ]; do
122 /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break
123 sleep 1
124 let TIMEOUT=${TIMEOUT}-1
125 done
126 if [ $TIMEOUT -eq 0 ]; then
127 echo "Timeout error occurred trying to stop MySQL Daemon."
128 ret=1
129 action $"Stopping $prog: " /bin/false
130 else
131 rm -f $lockfile
132 rm -f "$socketfile"
133 action $"Stopping $prog: " /bin/true
134 fi
135 else
136 # kill command failed, probably insufficient permissions
137 action $"Stopping $prog: " /bin/false
138 ret=4
139 fi
140 else
141 # failed to read pidfile, probably insufficient permissions
142 action $"Stopping $prog: " /bin/false
143 ret=4
144 fi
145 return $ret
146}
147
148restart(){
149 stop
150 start
151}
152
153condrestart(){
154 [ -e $lockfile ] && restart || :
155}
156
157
158# See how we were called.
159case "$1" in
160 start)
161 start
162 ;;
163 stop)
164 stop
165 ;;
166 status)
167 status -p "$pidfile" $prog
168 ;;
169 restart)
170 restart
171 ;;
172 condrestart|try-restart)
173 condrestart
174 ;;
175 reload)
176 exit 3
177 ;;
178 force-reload)
179 restart
180 ;;
181 *)
182 echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
183 exit 2
184esac
185
186exit $?
diff --git a/mariadb/centos/files/mysql.service.in b/mariadb/centos/files/mysql.service.in
deleted file mode 100644
index c385b4a..0000000
--- a/mariadb/centos/files/mysql.service.in
+++ /dev/null
@@ -1,70 +0,0 @@
1# It's not recommended to modify this file in-place, because it will be
2# overwritten during package upgrades. If you want to customize, the
3# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service",
4# containing
5# .include /usr/lib/systemd/system/@DAEMON_NAME@.service
6# ...make your changes here...
7# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf",
8# which doesn't need to include ".include" call and which will be parsed
9# after the file @DAEMON_NAME@.service itself is parsed.
10#
11# For more info about custom unit files, see systemd.unit(5) or
12# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
13
14# For example, if you want to increase mysql's open-files-limit to 10000,
15# you need to increase systemd's LimitNOFILE setting, so create a file named
16# "/etc/systemd/system/@DAEMON_NAME@.service.d/limits.conf" containing:
17# [Service]
18# LimitNOFILE=10000
19
20# Note: /usr/lib/... is recommended in the .include line though /lib/...
21# still works.
22# Don't forget to reload systemd daemon after you change unit configuration:
23# root> systemctl --system daemon-reload
24
25# Use [mysqld.INSTANCENAME] as sections in my.cnf to configure this instance.
26
27[Unit]
28Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
29After=syslog.target
30After=network.target
31
32[Service]
33Type=notify
34User=mysql
35Group=mysql
36
37ExecStartPre=@libexecdir@/mysql-check-socket
38ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n
39# MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
40# Note: we set --basedir to prevent probes that might trigger SELinux alarms,
41# per bug #547485
42ExecStart=@libexecdir@/mysqld --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
43ExecStartPost=@libexecdir@/mysql-check-upgrade
44ExecStopPost=@libexecdir@/mysql-wait-stop
45
46# Setting this to true can break replication and the Type=notify settings
47# See also bind-address mysqld option.
48PrivateNetwork=false
49
50KillMode=process
51KillSignal=SIGTERM
52
53# Don't want to see an automated SIGKILL ever
54SendSIGKILL=no
55
56# Restart crashed server only, on-failure would also restart, for example, when
57# my.cnf contains unknown option
58Restart=on-abort
59RestartSec=5s
60
61UMask=007
62
63# Give a reasonable amount of time for the server to start up/shut down
64TimeoutSec=300
65
66# Place temp files in a secure directory, not /tmp
67PrivateTmp=true
68
69[Install]
70WantedBy=multi-user.target
diff --git a/mariadb/centos/files/mysql.tmpfiles.d.in b/mariadb/centos/files/mysql.tmpfiles.d.in
deleted file mode 100644
index 9e6b6e8..0000000
--- a/mariadb/centos/files/mysql.tmpfiles.d.in
+++ /dev/null
@@ -1,3 +0,0 @@
1# Do not edit this file.
2# To override this, put /etc/tmpfiles.d/mariadb.conf instead.
3d @PID_FILE_DIR@ 0755 mysql mysql -
diff --git a/mariadb/centos/files/mysql@.service.in b/mariadb/centos/files/mysql@.service.in
deleted file mode 100644
index ab9a7cd..0000000
--- a/mariadb/centos/files/mysql@.service.in
+++ /dev/null
@@ -1,77 +0,0 @@
1# Multi instance version of mariadb. For if you run mutiple verions at once.
2# Also used for @DAEMON_NAME@@bootstrap to bootstrap Galera.
3#
4# To use multi instance variant, use [mysqld.INSTANCENAME] as sections in my.cnf
5# and start the service via:
6# systemctl start @DAEMON_NAME@@{instancename}.server
7#
8# It's not recommended to modify this file in-place, because it will be
9# overwritten during package upgrades. If you want to customize, the
10# best way is to create a file "/etc/systemd/system/@DAEMON_NAME@.service",
11# containing
12# .include /usr/lib/systemd/system/@DAEMON_NAME@.service
13# ...make your changes here...
14# or create a file "/etc/systemd/system/@DAEMON_NAME@.service.d/foo.conf",
15# which doesn't need to include ".include" call and which will be parsed
16# after the file @DAEMON_NAME@.service itself is parsed.
17#
18# For more info about custom unit files, see systemd.unit(5) or
19# http://fedoraproject.org/wiki/Systemd#How_do_I_customize_a_unit_file.2F_add_a_custom_unit_file.3F
20
21# For example, if you want to increase mysql's open-files-limit to 10000,
22# you need to increase systemd's LimitNOFILE setting, so create a file named
23# "/etc/systemd/system/@DAEMON_NAME@.service.d/limits.conf" containing:
24# [Service]
25# LimitNOFILE=10000
26
27# Note: /usr/lib/... is recommended in the .include line though /lib/...
28# still works.
29# Don't forget to reload systemd daemon after you change unit configuration:
30# root> systemctl --system daemon-reload
31
32# Use [mysqld.INSTANCENAME] as sections in my.cnf to configure this instance.
33
34[Unit]
35Description=@NICE_PROJECT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@ database server
36After=syslog.target
37After=network.target
38
39[Service]
40Type=notify
41User=mysql
42Group=mysql
43
44ExecStartPre=@libexecdir@/mysql-check-socket
45ExecStartPre=@libexecdir@/mysql-prepare-db-dir %n
46# MYSQLD_OPTS here is for users to set in /etc/systemd/system/@DAEMON_NAME@@.service.d/MY_SPECIAL.conf
47# Note: we set --basedir to prevent probes that might trigger SELinux alarms,
48# per bug #547485
49ExecStart=@libexecdir@/mysqld --defaults-group-suffix=.%I --basedir=@prefix@ $MYSQLD_OPTS $_WSREP_NEW_CLUSTER
50ExecStartPost=@libexecdir@/mysql-check-upgrade
51ExecStopPost=@libexecdir@/mysql-wait-stop
52
53# Setting this to true can break replication and the Type=notify settings
54# See also bind-address mysqld option.
55PrivateNetwork=false
56
57KillMode=process
58KillSignal=SIGTERM
59
60# Don't want to see an automated SIGKILL ever
61SendSIGKILL=no
62
63# Restart crashed server only, on-failure would also restart, for example, when
64# my.cnf contains unknown option
65Restart=on-abort
66RestartSec=5s
67
68UMask=007
69
70# Give a reasonable amount of time for the server to start up/shut down
71TimeoutSec=300
72
73# Place temp files in a secure directory, not /tmp
74PrivateTmp=true
75
76[Install]
77WantedBy=multi-user.target
diff --git a/mariadb/centos/files/mysql_config_multilib.sh b/mariadb/centos/files/mysql_config_multilib.sh
deleted file mode 100644
index 06c2a2b..0000000
--- a/mariadb/centos/files/mysql_config_multilib.sh
+++ /dev/null
@@ -1,26 +0,0 @@
1#! /bin/sh
2#
3# Wrapper script for mysql_config to support multilib
4#
5# This command respects setarch
6
7bits=$(rpm --eval %__isa_bits)
8
9case $bits in
10 32|64) status=known ;;
11 *) status=unknown ;;
12esac
13
14if [ "$status" = "unknown" ] ; then
15 echo "$0: error: command 'rpm --eval %__isa_bits' returned unknown value: $bits"
16 exit 1
17fi
18
19
20if [ -x @bindir@/mysql_config-$bits ] ; then
21 @bindir@/mysql_config-$bits "$@"
22else
23 echo "$0: error: needed binary: @bindir@/mysql_config-$bits is missing"
24 exit 1
25fi
26
diff --git a/mariadb/centos/files/rh-skipped-tests-arm.list b/mariadb/centos/files/rh-skipped-tests-arm.list
deleted file mode 100644
index d7e0b58..0000000
--- a/mariadb/centos/files/rh-skipped-tests-arm.list
+++ /dev/null
@@ -1,8 +0,0 @@
1main.partition_exchange : #1399847
2main.analyze_stmt_orderby : #1399847
3main.explain_json_innodb : #1399847
4main.explain_json_format_partitions : #1399847
5main.analyze_format_json : #1399847
6main.explain_json : #1399847
7main.subselect_cache : #1399847
8main.type_year : #1399847
diff --git a/mariadb/centos/files/rh-skipped-tests-base.list b/mariadb/centos/files/rh-skipped-tests-base.list
deleted file mode 100644
index 2992d7e..0000000
--- a/mariadb/centos/files/rh-skipped-tests-base.list
+++ /dev/null
@@ -1,9 +0,0 @@
1main.userstat : #1399847
2main.multi_update : #1399847
3main.set_statement_notembedded_binlog : #1399847
4main.ssl_7937 : #1399847
5main.ssl_crl_clients : #1399847
6main.ssl_cert_verify : #1399847
7perfschema.nesting : #1399847
8perfschema.socket_summary_by_event_name_func : #1399847
9perfschema.socket_summary_by_instance_func : #1399847
diff --git a/mariadb/centos/files/rh-skipped-tests-ppc-s390.list b/mariadb/centos/files/rh-skipped-tests-ppc-s390.list
deleted file mode 100644
index e69de29..0000000
--- a/mariadb/centos/files/rh-skipped-tests-ppc-s390.list
+++ /dev/null
diff --git a/mariadb/centos/mariadb.spec b/mariadb/centos/mariadb.spec
deleted file mode 100644
index 5a1a82a..0000000
--- a/mariadb/centos/mariadb.spec
+++ /dev/null
@@ -1,2033 +0,0 @@
1# Prefix that is used for patches
2%global pkg_name %{name}
3%global pkgnamepatch mariadb
4
5# Regression tests may take a long time (many cores recommended), skip them by
6# passing --nocheck to rpmbuild or by setting runselftest to 0 if defining
7# --nocheck is not possible (e.g. in koji build)
8%{!?runselftest:%global runselftest 0}
9
10# Set this to 1 to see which tests fail, but 0 on production ready build
11%global ignore_testsuite_result 0
12
13# In f20+ use unversioned docdirs, otherwise the old versioned one
14%global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}}
15%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}}
16
17# Use Full RELRO for all binaries (RHBZ#1092548)
18%global _hardened_build 1
19
20# By default, patch(1) creates backup files when chunks apply with offsets.
21# Turn that off to ensure such files don't get included in RPMs (cf bz#884755).
22%global _default_patch_flags --no-backup-if-mismatch
23
24# TokuDB engine is now part of MariaDB, but it is available only for x86_64;
25# variable tokudb allows to build with TokuDB storage engine
26# Temporarily disabled in F21+ for https://mariadb.atlassian.net/browse/MDEV-6446
27# WRS: TokuDB has AGPL license, so disable it
28%ifarch 0 #x86_64
29%bcond_without tokudb
30%else
31%bcond_with tokudb
32%endif
33
34# Mroonga engine is now part of MariaDB, but it only builds for x86_64;
35# variable mroonga allows to build with Mroonga storage engine
36%ifarch x86_64 i686
37%bcond_without mroonga
38%else
39%bcond_with mroonga
40%endif
41
42# The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
43# hierarchies and more complex graph structures to be handled in a relational
44# fashion; enabled by default
45# Temporarily disabling oqgraph: https://mariadb.atlassian.net/browse/MDEV-9479
46%bcond_with oqgraph
47
48# For some use cases we do not need some parts of the package
49%bcond_without clibrary
50%bcond_without embedded
51%bcond_without devel
52%bcond_without client
53%bcond_without common
54%bcond_without errmsg
55%bcond_without bench
56%bcond_without test
57%bcond_without connect
58%bcond_without galera
59
60# When there is already another package that ships /etc/my.cnf,
61# rather include it than ship the file again, since conflicts between
62# those files may create issues
63%bcond_without config
64
65# For deep debugging we need to build binaries with extra debug info
66%bcond_with debug
67
68# Include files for SysV init or systemd
69%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
70%bcond_without init_systemd
71%bcond_with init_sysv
72%global daemon_name %{name}
73%global daemondir %{_unitdir}
74%global daemon_no_prefix %{pkg_name}
75%global mysqld_pid_dir mysqld
76%else
77%bcond_with init_systemd
78%bcond_without init_sysv
79%global daemon_name mysqld
80%global daemondir %{_sysconfdir}/rc.d/init.d
81%global daemon_no_prefix mysqld
82%endif
83
84# MariaDB 10.0 and later requires pcre >= 8.35, otherwise we need to use
85# the bundled library, since the package cannot be build with older version
86%global pcre_version 8.41
87%if 0%{?fedora} >= 21
88%bcond_without pcre
89%else
90%bcond_with pcre
91%endif
92
93# We define some system's well known locations here so we can use them easily
94# later when building to another location (like SCL)
95%global logrotateddir %{_sysconfdir}/logrotate.d
96%global logfiledir %{_localstatedir}/log/%{daemon_name}
97%global logfile %{logfiledir}/%{daemon_name}.log
98
99# Directory for storing pid file
100%global pidfiledir %{_localstatedir}/run/%{daemon_name}
101
102# Defining where database data live
103%global dbdatadir %{_localstatedir}/lib/mysql
104
105# Home directory of mysql user should be same for all packages that create it
106%global mysqluserhome /var/lib/mysql
107
108# The evr of mysql we want to obsolete
109%global obsoleted_mysql_evr 5.6-0
110%global obsoleted_mysql_case_evr 5.5.30-5
111
112# The evr of mariadb-galera we want to obsolete
113%global obsoleted_mariadb_galera_evr 1:10.0.17-6
114%global obsoleted_mariadb_galera_common_evr 5.5.36-10
115%global obsoleted_mariadb_galera_server_evr 1:10.0.17-6
116
117# Provide mysql names for compatibility
118%bcond_without mysql_names
119%bcond_without conflicts
120
121# Make long macros shorter
122%global sameevr %{epoch}:%{version}-%{release}
123%global compatver 10.1
124%global bugfixver 28
125
126Name: mariadb
127Version: %{compatver}.%{bugfixver}
128Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
129Epoch: 3
130
131Summary: A community developed branch of MySQL
132Group: Applications/Databases
133URL: http://mariadb.org
134# Exceptions allow client libraries to be linked with most open source SW,
135# not only GPL code. See README.mysql-license
136License: GPLv2 with exceptions and LGPLv2 and BSD
137
138#Source0: http://mirrors.syringanetworks.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz
139Source0: mariadb-%{version}.tar.gz
140Source2: mysql_config_multilib.sh
141Source3: my.cnf.in
142Source5: README.mysql-cnf
143Source6: README.mysql-docs
144Source7: README.mysql-license
145Source9: mysql-embedded-check.c
146Source10: mysql.tmpfiles.d.in
147Source11: mysql.service.in
148Source12: mysql-prepare-db-dir.sh
149Source13: mysql-wait-ready.sh
150Source14: mysql-check-socket.sh
151Source15: mysql-scripts-common.sh
152Source16: mysql-check-upgrade.sh
153Source17: mysql-wait-stop.sh
154Source18: mysql@.service.in
155Source19: mysql.init.in
156Source50: rh-skipped-tests-base.list
157Source51: rh-skipped-tests-arm.list
158Source52: rh-skipped-tests-ppc-s390.list
159# TODO: clustercheck contains some hard-coded paths, these should be expanded using template system
160Source70: clustercheck.sh
161Source71: LICENSE.clustercheck
162Source72: mariadb-server-galera.te
163
164# Comments for these patches are in the patch files
165# Patches common for more mysql-like packages
166Patch1: %{pkgnamepatch}-strmov.patch
167Patch2: %{pkgnamepatch}-install-test.patch
168Patch4: %{pkgnamepatch}-logrotate.patch
169Patch5: %{pkgnamepatch}-file-contents.patch
170Patch7: %{pkgnamepatch}-scripts.patch
171Patch8: %{pkgnamepatch}-install-db-sharedir.patch
172Patch9: %{pkgnamepatch}-ownsetup.patch
173Patch12: %{pkgnamepatch}-admincrash.patch
174Patch13: %{pkgnamepatch}-ssl-cypher.patch
175Patch14: %{pkgnamepatch}-example-config-files.patch
176
177# Patches specific for this mysql package
178Patch30: %{pkgnamepatch}-errno.patch
179# Patch31: %{pkgnamepatch}-string-overflow.patch
180Patch32: %{pkgnamepatch}-basedir.patch
181# Patch34: %{pkgnamepatch}-covscan-stroverflow.patch
182Patch37: %{pkgnamepatch}-notestdb.patch
183# Due to LP https://bugs.launchpad.net/tripleo/+bug/1638864
184# Reverts 7497ebf8a49bfe30bb4110f2ac20a30f804b7946 until we fix the
185# galera resource agent to cope with this change
186# When RHBZ#1391470 gets fixed and released in centos we can remove this patch
187Patch38: %{pkgnamepatch}-revert-stdouterr-closing.patch
188
189# Patches for galera
190Patch40: %{pkgnamepatch}-galera.cnf.patch
191# Patch41: %{pkgnamepatch}-galera-new-cluster-help.patch
192
193BuildRequires: cmake
194BuildRequires: bison
195BuildRequires: gcc-c++
196BuildRequires: libaio-devel
197BuildRequires: libedit-devel
198BuildRequires: ncurses-devel
199BuildRequires: perl
200%if 0%{?fedora} >= 22 || 0%{?rhel} > 7
201BuildRequires: perl-generators
202%endif
203BuildRequires: systemtap-sdt-devel
204BuildRequires: zlib-devel
205BuildRequires: multilib-rpm-config
206
207# Mariabackup
208BuildRequires: libarchive libarchive-devel
209# auth_pam.so plugin will be build if pam-devel is installed
210BuildRequires: pam-devel
211# use either new enough version of pcre or provide bundles(pcre)
212%{?with_pcre:BuildRequires: pcre-devel >= 8.35}
213%{!?with_pcre:Provides: bundled(pcre) = %{pcre_version}}
214# Tests requires time and ps and some perl modules
215BuildRequires: procps
216BuildRequires: time
217BuildRequires: perl(Env)
218BuildRequires: perl(Exporter)
219BuildRequires: perl(Fcntl)
220BuildRequires: perl(File::Temp)
221BuildRequires: perl(Data::Dumper)
222BuildRequires: perl(Getopt::Long)
223BuildRequires: perl(IPC::Open3)
224BuildRequires: perl(Memoize)
225BuildRequires: perl(Socket)
226BuildRequires: perl(Sys::Hostname)
227BuildRequires: perl(Test::More)
228BuildRequires: perl(Time::HiRes)
229BuildRequires: perl(Symbol)
230
231# Temporary workaound to build with OpenSSL 1.0 on Fedora >=26 (wich requires OpenSSL 1.1)
232%if 0%{?fedora} >= 26
233BuildRequires: compat-openssl10-devel
234Requires: compat-openssl10
235%else
236# for running some openssl tests rhbz#1189180
237BuildRequires: openssl
238BuildRequires: openssl-devel
239%endif
240
241BuildRequires: krb5-devel
242
243BuildRequires: selinux-policy-devel
244%{?with_init_systemd:BuildRequires: systemd systemd-devel}
245
246BuildRequires: krb5-devel
247
248Requires: bash
249Requires: fileutils
250Requires: grep
251Requires: %{name}-common%{?_isa} = %{sameevr}
252
253# Explicit EVR requirement for -libs is needed for
254# https://bugzilla.redhat.com/show_bug.cgi?id=1406320
255Requires: %{name}-libs%{?_isa} = %{sameevr}
256
257%if %{with mysql_names}
258Provides: mysql = %{sameevr}
259Provides: mysql%{?_isa} = %{sameevr}
260Provides: mysql-compat-client = %{sameevr}
261Provides: mysql-compat-client%{?_isa} = %{sameevr}
262%endif
263
264
265
266# MySQL (with caps) is upstream's spelling of their own RPMs for mysql
267%{?obsoleted_mysql_case_evr:Obsoletes: MySQL < %{obsoleted_mysql_case_evr}}
268%{?obsoleted_mysql_evr:Obsoletes: mysql < %{obsoleted_mysql_evr}}
269%{?with_conflicts:Conflicts: community-mysql}
270
271# obsoletion of mariadb-galera
272Provides: mariadb-galera = %{sameevr}
273Obsoletes: mariadb-galera < %{obsoleted_mariadb_galera_evr}
274
275# Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
276%if 0%{?fedora} > 14 || 0%{?rhel} > 6
277%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::)
278%global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
279%else
280%filter_from_requires /perl(\(hostnames\|lib::mtr\|lib::v1\|mtr_\|My::\)/d
281%filter_provides_in -P (%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\.so)
282%filter_setup
283%endif
284
285# Define license macro if not present
286%{!?_licensedir:%global license %doc}
287
288%description
289MariaDB is a community developed branch of MySQL.
290MariaDB is a multi-user, multi-threaded SQL database server.
291It is a client/server implementation consisting of a server daemon (mysqld)
292and many different client programs and libraries. The base package
293contains the standard MariaDB/MySQL client programs and generic MySQL files.
294
295
296%if %{with clibrary}
297%package libs
298Summary: The shared libraries required for MariaDB/MySQL clients
299Group: Applications/Databases
300Requires: %{name}-common%{?_isa} = %{sameevr}
301%if %{with mysql_names}
302Provides: mysql-libs = %{sameevr}
303Provides: mysql-libs%{?_isa} = %{sameevr}
304%endif
305%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-libs < %{obsoleted_mysql_case_evr}}
306%{?obsoleted_mysql_evr:Obsoletes: mysql-libs < %{obsoleted_mysql_evr}}
307
308%description libs
309The mariadb-libs package provides the essential shared libraries for any
310MariaDB/MySQL client program or interface. You will need to install this
311package to use any other MariaDB package or any clients that need to connect
312to a MariaDB/MySQL server. MariaDB is a community developed branch of MySQL.
313%endif
314
315
316%if %{with config}
317%package config
318Summary: The config files required by server and client
319Group: Applications/Databases
320
321%description config
322The package provides the config file my.cnf and my.cnf.d directory used by any
323MariaDB or MySQL program. You will need to install this package to use any
324other MariaDB or MySQL package if the config files are not provided in the
325package itself.
326%endif
327
328
329%if %{with common}
330%package common
331Summary: The shared files required by server and client
332Group: Applications/Databases
333Requires: %{_sysconfdir}/my.cnf
334
335# obsoletion of mariadb-galera-common
336Provides: mariadb-galera-common = %{sameevr}
337Obsoletes: mariadb-galera-common < %{obsoleted_mariadb_galera_common_evr}
338
339%description common
340The package provides the essential shared files for any MariaDB program.
341You will need to install this package to use any other MariaDB package.
342%endif
343
344
345%if %{with errmsg}
346%package errmsg
347Summary: The error messages files required by server and embedded
348Group: Applications/Databases
349Requires: %{name}-common%{?_isa} = %{sameevr}
350
351%description errmsg
352The package provides error messages files for the MariaDB daemon and the
353embedded server. You will need to install this package to use any of those
354MariaDB packages.
355%endif
356
357
358%if %{with galera}
359%package server-galera
360Summary: The configuration files and scripts for galera replication
361Group: Applications/Databases
362Requires: %{name}-common%{?_isa} = %{sameevr}
363Requires: %{name}-server%{?_isa} = %{sameevr}
364Requires: galera >= 25.3.3
365Requires(post): libselinux-utils
366Requires(post): policycoreutils-python
367
368# obsoletion of mariadb-galera-server
369Provides: mariadb-galera-server = %{sameevr}
370Obsoletes: mariadb-galera-server <= %{obsoleted_mariadb_galera_server_evr}
371
372%description server-galera
373MariaDB is a multi-user, multi-threaded SQL database server. It is a
374client/server implementation consisting of a server daemon (mysqld)
375and many different client programs and libraries. This package contains
376the MariaDB server and some accompanying files and directories.
377MariaDB is a community developed branch of MySQL.
378%endif
379
380
381%package server
382Summary: The MariaDB server and related files
383Group: Applications/Databases
384
385# note: no version here = %%{version}-%%{release}
386%if %{with mysql_names}
387Requires: mysql-compat-client%{?_isa}
388Requires: mysql%{?_isa}
389%else
390Requires: %{name}%{?_isa}
391%endif
392Requires: %{name}-common%{?_isa} = %{sameevr}
393Requires: %{_sysconfdir}/my.cnf
394Requires: %{_sysconfdir}/my.cnf.d
395Requires: %{name}-errmsg%{?_isa} = %{sameevr}
396Requires: sh-utils
397Requires(pre): /usr/sbin/useradd
398%if %{with init_systemd}
399# We require this to be present for %%{_tmpfilesdir}
400Requires: systemd
401# Make sure it's there when scriptlets run, too
402Requires(pre): systemd
403Requires(posttrans): systemd
404%{?systemd_requires: %systemd_requires}
405%endif
406# mysqlhotcopy needs DBI/DBD support
407Requires: perl(DBI)
408Requires: perl(DBD::mysql)
409# wsrep requirements
410Requires: lsof
411Requires: net-tools
412Requires: sh-utils
413Requires: rsync
414%if %{with mysql_names}
415Provides: mysql-server = %{sameevr}
416Provides: mysql-server%{?_isa} = %{sameevr}
417Provides: mysql-compat-server = %{sameevr}
418Provides: mysql-compat-server%{?_isa} = %{sameevr}
419%endif
420%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-server < %{obsoleted_mysql_case_evr}}
421%{?with_conflicts:Conflicts: community-mysql-server}
422%{?with_conflicts:Conflicts: mariadb-galera-server <= %{obsoleted_mariadb_galera_server_evr}}
423%{?obsoleted_mysql_evr:Obsoletes: mysql-server < %{obsoleted_mysql_evr}}
424
425%description server
426MariaDB is a multi-user, multi-threaded SQL database server. It is a
427client/server implementation consisting of a server daemon (mysqld)
428and many different client programs and libraries. This package contains
429the MariaDB server and some accompanying files and directories.
430MariaDB is a community developed branch of MySQL.
431
432
433%if %{with oqgraph}
434%package oqgraph-engine
435Summary: The Open Query GRAPH engine for MariaDB
436Group: Applications/Databases
437Requires: %{name}-server%{?_isa} = %{sameevr}
438# boost and Judy required for oograph
439BuildRequires: boost-devel
440BuildRequires: Judy-devel
441
442%description oqgraph-engine
443The package provides Open Query GRAPH engine (OQGRAPH) as plugin for MariaDB
444database server. OQGRAPH is a computation engine allowing hierarchies and more
445complex graph structures to be handled in a relational fashion. In a nutshell,
446tree structures and friend-of-a-friend style searches can now be done using
447standard SQL syntax, and results joined onto other tables.
448%endif
449
450
451%if %{with connect}
452%package connect-engine
453Summary: The CONNECT storage engine for MariaDB
454Group: Applications/Databases
455Requires: %{name}-server%{?_isa} = %{sameevr}
456
457%description connect-engine
458The CONNECT storage engine enables MariaDB to access external local or
459remote data (MED). This is done by defining tables based on different data
460types, in particular files in various formats, data extracted from other DBMS
461or products (such as Excel), or data retrieved from the environment
462(for example DIR, WMI, and MAC tables).
463%endif
464
465
466%if %{with devel}
467%package devel
468Summary: Files for development of MariaDB/MySQL applications
469Group: Applications/Databases
470%{?with_clibrary:Requires: %{name}-libs%{?_isa} = %{sameevr}}
471# avoid issues with openssl1.0 / openssl1.1 / compat
472Requires: pkgconfig(openssl)
473%if %{with mysql_names}
474Provides: mysql-devel = %{sameevr}
475Provides: mysql-devel%{?_isa} = %{sameevr}
476%endif
477%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-devel < %{obsoleted_mysql_case_evr}}
478%{?obsoleted_mysql_evr:Obsoletes: mysql-devel < %{obsoleted_mysql_evr}}
479%{?with_conflicts:Conflicts: community-mysql-devel}
480
481%description devel
482MariaDB is a multi-user, multi-threaded SQL database server. This
483package contains the libraries and header files that are needed for
484developing MariaDB/MySQL client applications.
485MariaDB is a community developed branch of MySQL.
486%endif
487
488
489%if %{with embedded}
490%package embedded
491Summary: MariaDB as an embeddable library
492Group: Applications/Databases
493Requires: %{name}-common%{?_isa} = %{sameevr}
494Requires: %{name}-errmsg%{?_isa} = %{sameevr}
495%if %{with mysql_names}
496Provides: mysql-embedded = %{sameevr}
497Provides: mysql-embedded%{?_isa} = %{sameevr}
498%endif
499%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded < %{obsoleted_mysql_case_evr}}
500%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded < %{obsoleted_mysql_evr}}
501
502%description embedded
503MariaDB is a multi-user, multi-threaded SQL database server. This
504package contains a version of the MariaDB server that can be embedded
505into a client application instead of running as a separate process.
506MariaDB is a community developed branch of MySQL.
507
508
509%package embedded-devel
510Summary: Development files for MariaDB as an embeddable library
511Group: Applications/Databases
512Requires: %{name}-embedded%{?_isa} = %{sameevr}
513Requires: %{name}-devel%{?_isa} = %{sameevr}
514# embedded-devel should require libaio-devel (rhbz#1290517)
515Requires: libaio-devel
516%if %{with mysql_names}
517Provides: mysql-embedded-devel = %{sameevr}
518Provides: mysql-embedded-devel%{?_isa} = %{sameevr}
519%endif
520%{?with_conflicts:Conflicts: community-mysql-embedded-devel}
521%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded-devel < %{obsoleted_mysql_case_evr}}
522%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr}}
523
524%description embedded-devel
525MariaDB is a multi-user, multi-threaded SQL database server. This
526package contains files needed for developing and testing with
527the embedded version of the MariaDB server.
528MariaDB is a community developed branch of MySQL.
529%endif
530
531
532%if %{with bench}
533%package bench
534Summary: MariaDB benchmark scripts and data
535Group: Applications/Databases
536Requires: %{name}%{?_isa} = %{sameevr}
537%if %{with mysql_names}
538Provides: mysql-bench = %{sameevr}
539Provides: mysql-bench%{?_isa} = %{sameevr}
540%endif
541%{?with_conflicts:Conflicts: community-mysql-bench}
542%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-bench < %{obsoleted_mysql_case_evr}}
543%{?obsoleted_mysql_evr:Obsoletes: mysql-bench < %{obsoleted_mysql_evr}}
544
545%description bench
546MariaDB is a multi-user, multi-threaded SQL database server. This
547package contains benchmark scripts and data for use when benchmarking
548MariaDB.
549MariaDB is a community developed branch of MySQL.
550%endif
551
552
553%if %{with test}
554%package test
555Summary: The test suite distributed with MariaDB
556Group: Applications/Databases
557Requires: %{name}%{?_isa} = %{sameevr}
558Requires: %{name}-common%{?_isa} = %{sameevr}
559Requires: %{name}-server%{?_isa} = %{sameevr}
560Requires: perl(Env)
561Requires: perl(Exporter)
562Requires: perl(Fcntl)
563Requires: perl(File::Temp)
564Requires: perl(Data::Dumper)
565Requires: perl(Getopt::Long)
566Requires: perl(IPC::Open3)
567Requires: perl(Socket)
568Requires: perl(Sys::Hostname)
569Requires: perl(Test::More)
570Requires: perl(Time::HiRes)
571%{?with_conflicts:Conflicts: community-mysql-test}
572%if %{with mysql_names}
573Provides: mysql-test = %{sameevr}
574Provides: mysql-test%{?_isa} = %{sameevr}
575%endif
576%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-test < %{obsoleted_mysql_case_evr}}
577%{?obsoleted_mysql_evr:Obsoletes: mysql-test < %{obsoleted_mysql_evr}}
578
579%description test
580MariaDB is a multi-user, multi-threaded SQL database server. This
581package contains the regression test suite distributed with
582the MariaDB sources.
583MariaDB is a community developed branch of MySQL.
584%endif
585
586%prep
587%setup -q -n mariadb-%{version}
588
589%patch1 -p1
590%patch2 -p1
591%patch4 -p1
592%patch5 -p1
593%patch7 -p1
594%patch8 -p1
595%patch9 -p1
596%patch12 -p1
597%patch13 -p1
598%patch14 -p1
599%patch30 -p1
600# %patch31 -p1
601%patch32 -p1
602# %patch34 -p1
603%patch37 -p1
604%patch38 -p1
605%patch40 -p1
606# %patch41 -p1
607
608sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake
609# workaround to deploy mariadb@.service on EL7
610sed -i 's/IF(NOT CMAKE_VERSION VERSION_LESS 3.3.0 OR NOT RPM)/IF(TRUE)/g' support-files/CMakeLists.txt
611
612# workaround for upstream bug #56342
613rm -f mysql-test/t/ssl_8k_key-master.opt
614
615# generate a list of tests that fail, but are not disabled by upstream
616cat %{SOURCE50} | tee mysql-test/rh-skipped-tests.list
617
618# disable some tests failing on different architectures
619%ifarch %{arm} aarch64
620cat %{SOURCE51} | tee -a mysql-test/rh-skipped-tests.list
621%endif
622
623%ifarch ppc ppc64 ppc64p7 s390 s390x
624cat %{SOURCE52} | tee -a mysql-test/rh-skipped-tests.list
625%endif
626
627cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
628 %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} \
629 %{SOURCE70} scripts
630
631%if %{with galera}
632# prepare selinux policy
633mkdir selinux
634sed 's/mariadb-server-galera/%{name}-server-galera/' %{SOURCE72} > selinux/%{name}-server-galera.te
635cat selinux/%{name}-server-galera.te
636%endif
637
638# Check if PCRE version is actual
639%{!?with_pcre:
640pcre_maj=`grep '^m4_define(pcre_major' pcre/configure.ac | sed -r 's/^m4_define\(pcre_major, \[([0-9]+)\]\)/\1/'`
641pcre_min=`grep '^m4_define(pcre_minor' pcre/configure.ac | sed -r 's/^m4_define\(pcre_minor, \[([0-9]+)\]\)/\1/'`
642
643if [ %{pcre_version} != "$pcre_maj.$pcre_min" ]
644then
645 echo "\n PCRE version is outdated. \n\tIncluded version:%{pcre_version} \n\tUpstream version: $pcre_maj.$pcre_min\n"
646 exit 1
647fi
648}
649
650
651
652%build
653
654# fail quickly and obviously if user tries to build as root
655%if %runselftest
656 if [ x"$(id -u)" = "x0" ]; then
657 echo "mysql's regression tests fail if run as root."
658 echo "If you really need to build the RPM as root, use"
659 echo "--nocheck to skip the regression tests."
660 exit 1
661 fi
662%endif
663
664CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
665# force PIC mode so that we can build libmysqld.so
666CFLAGS="$CFLAGS -fPIC"
667# GCC 4.9 causes segfaults: https://mariadb.atlassian.net/browse/MDEV-6360
668CFLAGS="$CFLAGS -fno-delete-null-pointer-checks"
669# gcc seems to have some bugs on sparc as of 4.4.1, back off optimization
670# submitted as bz #529298
671%ifarch sparc sparcv9 sparc64
672CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
673%endif
674# significant performance gains can be achieved by compiling with -O3 optimization
675# rhbz#1051069
676%ifarch ppc64
677CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O3|g" `
678%endif
679CXXFLAGS="$CFLAGS"
680export CFLAGS CXXFLAGS
681
682%if 0%{?_hardened_build}
683# building with PIE
684LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now"
685export LDFLAGS
686%endif
687
688# The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX
689# so we can't use %%{_datadir} and so forth here.
690%cmake . \
691 -DBUILD_CONFIG=mysql_release \
692 -DFEATURE_SET="community" \
693 -DINSTALL_LAYOUT=RPM \
694 -DDAEMON_NAME="%{daemon_name}" \
695 -DDAEMON_NO_PREFIX="%{daemon_no_prefix}" \
696 -DLOG_LOCATION="%{logfile}" \
697 -DPID_FILE_DIR="%{pidfiledir}" \
698 -DNICE_PROJECT_NAME="MariaDB" \
699 -DRPM="%{?rhel:rhel%{rhel}}%{!?rhel:fedora%{fedora}}" \
700 -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
701 -DINSTALL_SYSCONFDIR="%{_sysconfdir}" \
702 -DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \
703 -DINSTALL_DOCDIR="share/doc/%{_pkgdocdirname}" \
704 -DINSTALL_DOCREADMEDIR="share/doc/%{_pkgdocdirname}" \
705 -DINSTALL_INCLUDEDIR=include/mysql \
706 -DINSTALL_INFODIR=share/info \
707 -DINSTALL_LIBDIR="%{_lib}/mysql" \
708 -DINSTALL_MANDIR=share/man \
709 -DINSTALL_MYSQLSHAREDIR=share/%{pkg_name} \
710 -DINSTALL_MYSQLTESTDIR=share/mysql-test \
711 -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
712 -DINSTALL_SBINDIR=libexec \
713 -DINSTALL_SCRIPTDIR=bin \
714 -DINSTALL_SQLBENCHDIR=share \
715 -DINSTALL_SUPPORTFILESDIR=share/%{pkg_name} \
716 -DMYSQL_DATADIR="%{dbdatadir}" \
717 -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
718 -DENABLED_LOCAL_INFILE=ON \
719 -DENABLE_DTRACE=ON \
720 -DWITH_EMBEDDED_SERVER=ON \
721 -DWITH_SSL=system \
722 -DWITH_ZLIB=system \
723%{?with_pcre: -DWITH_PCRE=system}\
724 -DWITH_JEMALLOC=no \
725%{!?with_tokudb: -DWITHOUT_TOKUDB=ON}\
726%{!?with_mroonga: -DWITHOUT_MROONGA=ON}\
727%{!?with_oqgraph: -DWITHOUT_OQGRAPH=ON}\
728 -DTMPDIR=/var/tmp \
729%{?with_debug: -DCMAKE_BUILD_TYPE=Debug}\
730 %{?_hardened_build:-DWITH_MYSQLD_LDFLAGS="-pie -Wl,-z,relro,-z,now"}
731
732make %{?_smp_mflags} VERBOSE=1
733
734# debuginfo extraction scripts fail to find source files in their real
735# location -- satisfy them by copying these files into location, which
736# is expected by scripts
737for e in innobase xtradb ; do
738 for f in pars0grm.y pars0lex.l ; do
739 cp -p "storage/$e/pars/$f" "storage/$e/$f"
740 done
741done
742
743# build selinux policy
744%if %{with galera}
745pushd selinux
746make -f /usr/share/selinux/devel/Makefile %{name}-server-galera.pp
747%endif
748
749%install
750make DESTDIR=%{buildroot} install
751
752# cmake generates some completely wacko references to -lprobes_mysql when
753# building with dtrace support. Haven't found where to shut that off,
754# so resort to this blunt instrument. While at it, let's not reference
755# libmysqlclient_r anymore either.
756sed -e 's/-lprobes_mysql//' -e 's/-lmysqlclient_r/-lmysqlclient/' \
757 %{buildroot}%{_bindir}/mysql_config >mysql_config.tmp
758cp -p -f mysql_config.tmp %{buildroot}%{_bindir}/mysql_config
759chmod 755 %{buildroot}%{_bindir}/mysql_config
760
761# multilib header support
762for header in mysql/my_config.h mysql/private/config.h; do
763%multilib_fix_c_header --file %{_includedir}/$header
764done
765
766# multilib support for shell scripts
767# we only apply this to known Red Hat multilib arches, per bug #181335
768if %multilib_capable; then
769mv %{buildroot}%{_bindir}/mysql_config %{buildroot}%{_bindir}/mysql_config-%{__isa_bits}
770install -p -m 0755 scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_config
771fi
772
773# Upstream install this into arch-independent directory, TODO: report
774mkdir -p %{buildroot}/%{_libdir}/pkgconfig
775mv %{buildroot}/%{_datadir}/pkgconfig/*.pc %{buildroot}/%{_libdir}/pkgconfig
776
777# install INFO_SRC, INFO_BIN into libdir (upstream thinks these are doc files,
778# but that's pretty wacko --- see also %%{name}-file-contents.patch)
779install -p -m 644 Docs/INFO_SRC %{buildroot}%{_libdir}/mysql/
780install -p -m 644 Docs/INFO_BIN %{buildroot}%{_libdir}/mysql/
781rm -r %{buildroot}%{_datadir}/doc/%{_pkgdocdirname}/MariaDB-server-%{version}/
782
783mkdir -p %{buildroot}%{logfiledir}
784chmod 0750 %{buildroot}%{logfiledir}
785touch %{buildroot}%{logfile}
786
787# current setting in my.cnf is to use /var/run/mariadb for creating pid file,
788# however since my.cnf is not updated by RPM if changed, we need to create mysqld
789# as well because users can have odd settings in their /etc/my.cnf
790mkdir -p %{buildroot}%{pidfiledir}
791install -p -m 0755 -d %{buildroot}%{dbdatadir}
792
793%if %{with config}
794install -D -p -m 0644 scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
795%else
796rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf
797rm -f %{buildroot}%{_sysconfdir}/my.cnf
798%endif
799
800# use different config file name for each variant of server
801mv %{buildroot}%{_sysconfdir}/my.cnf.d/server.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf
802
803# install systemd unit files and scripts for handling server startup
804%if %{with init_systemd}
805install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
806install -D -p -m 644 scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service
807install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
808%if 0%{?mysqld_pid_dir:1}
809echo "d %{_localstatedir}/run/%{mysqld_pid_dir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
810%endif
811%endif
812
813# install SysV init script
814%if %{with init_sysv}
815install -D -p -m 755 scripts/mysql.init %{buildroot}%{daemondir}/%{daemon_name}
816%endif
817
818# helper scripts for service starting
819install -p -m 755 scripts/mysql-prepare-db-dir %{buildroot}%{_libexecdir}/mysql-prepare-db-dir
820install -p -m 755 scripts/mysql-wait-ready %{buildroot}%{_libexecdir}/mysql-wait-ready
821install -p -m 755 scripts/mysql-wait-stop %{buildroot}%{_libexecdir}/mysql-wait-stop
822install -p -m 755 scripts/mysql-check-socket %{buildroot}%{_libexecdir}/mysql-check-socket
823install -p -m 755 scripts/mysql-check-upgrade %{buildroot}%{_libexecdir}/mysql-check-upgrade
824install -p -m 644 scripts/mysql-scripts-common %{buildroot}%{_libexecdir}/mysql-scripts-common
825
826# install selinux policy
827%if %{with galera}
828install -p -m 644 -D selinux/%{name}-server-galera.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp
829%endif
830# install -p -m 644 -D selinux/%{name}.pp %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.pp
831# install -p -m 644 -D selinux/%{name}.te %{buildroot}%{_datadir}/selinux/packages/%{name}/%{name}.te
832
833
834# Remove libmysqld.a
835rm -f %{buildroot}%{_libdir}/mysql/libmysqld.a
836
837# libmysqlclient_r is no more. Upstream tries to replace it with symlinks
838# but that really doesn't work (wrong soname in particular). We'll keep
839# just the devel libmysqlclient_r.so link, so that rebuilding without any
840# source change is enough to get rid of dependency on libmysqlclient_r.
841rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so*
842ln -s libmysqlclient.so %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so
843
844# mysql-test includes one executable that doesn't belong under /usr/share,
845# so move it and provide a symlink
846mv %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process %{buildroot}%{_bindir}
847ln -s ../../../../../bin/my_safe_process %{buildroot}%{_datadir}/mysql-test/lib/My/SafeProcess/my_safe_process
848
849# should move this to /etc/ ?
850rm -f %{buildroot}%{_bindir}/mysql_embedded
851rm -f %{buildroot}%{_libdir}/mysql/*.a
852rm -f %{buildroot}%{_datadir}/%{pkg_name}/binary-configure
853rm -f %{buildroot}%{_datadir}/%{pkg_name}/magic
854rm -f %{buildroot}%{_datadir}/%{pkg_name}/ndb-config-2-node.ini
855rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysql.server
856rm -f %{buildroot}%{_datadir}/%{pkg_name}/mysqld_multi.server
857rm -f %{buildroot}%{_mandir}/man1/mysql-stress-test.pl.1*
858rm -f %{buildroot}%{_mandir}/man1/mysql-test-run.pl.1*
859rm -f %{buildroot}%{_bindir}/mytop
860
861#WRS
862rm -rf %{buildroot}/usr/DESTINATION/JdbcInterface.jar
863
864# put logrotate script where it needs to be
865mkdir -p %{buildroot}%{logrotateddir}
866mv %{buildroot}%{_datadir}/%{pkg_name}/mysql-log-rotate %{buildroot}%{logrotateddir}/%{daemon_name}
867chmod 644 %{buildroot}%{logrotateddir}/%{daemon_name}
868
869mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
870echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
871
872# copy additional docs into build tree so %%doc will find them
873install -p -m 0644 %{SOURCE5} %{basename:%{SOURCE5}}
874install -p -m 0644 %{SOURCE6} %{basename:%{SOURCE6}}
875install -p -m 0644 %{SOURCE7} %{basename:%{SOURCE7}}
876install -p -m 0644 %{SOURCE16} %{basename:%{SOURCE16}}
877install -p -m 0644 %{SOURCE71} %{basename:%{SOURCE71}}
878
879# install galera config file
880sed -i -r 's|^wsrep_provider=none|wsrep_provider=%{_libdir}/galera/libgalera_smm.so|' support-files/wsrep.cnf
881install -p -m 0644 support-files/wsrep.cnf %{buildroot}%{_sysconfdir}/my.cnf.d/galera.cnf
882
883# install the clustercheck script
884mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
885touch %{buildroot}%{_sysconfdir}/sysconfig/clustercheck
886install -p -m 0755 scripts/clustercheck %{buildroot}%{_bindir}/clustercheck
887
888# install the list of skipped tests to be available for user runs
889install -p -m 0644 mysql-test/rh-skipped-tests.list %{buildroot}%{_datadir}/mysql-test
890
891# remove unneeded RHEL-4 SELinux stuff
892rm -rf %{buildroot}%{_datadir}/%{pkg_name}/SELinux/
893
894# remove SysV init script and a symlink to that
895rm -f %{buildroot}%{_sysconfdir}/init.d/mysql
896rm -f %{buildroot}%{_libexecdir}/rcmysql
897
898# remove duplicate logrotate script
899rm -f %{buildroot}%{_sysconfdir}/logrotate.d/mysql
900
901# remove solaris files
902rm -rf %{buildroot}%{_datadir}/%{pkg_name}/solaris/
903
904# rename the wsrep README so it corresponds with the other README names
905mv Docs/README-wsrep Docs/README.wsrep
906
907# remove *.jar file from mysql-test
908rm -rf %{buildroot}%{_datadir}/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar
909
910%if %{without clibrary}
911unlink %{buildroot}%{_libdir}/mysql/libmysqlclient.so
912unlink %{buildroot}%{_libdir}/mysql/libmysqlclient_r.so
913rm -rf %{buildroot}%{_libdir}/mysql/libmysqlclient*.so.*
914rm -rf %{buildroot}%{_sysconfdir}/ld.so.conf.d
915rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
916%endif
917
918%if %{without embedded}
919rm -f %{buildroot}%{_libdir}/mysql/libmysqld.so*
920rm -f %{buildroot}%{_bindir}/{mysql_client_test_embedded,mysqltest_embedded}
921rm -f %{buildroot}%{_mandir}/man1/{mysql_client_test_embedded,mysqltest_embedded}.1*
922%endif
923
924%if %{without devel}
925rm -f %{buildroot}%{_bindir}/mysql_config*
926rm -rf %{buildroot}%{_includedir}/mysql
927rm -f %{buildroot}%{_datadir}/aclocal/mysql.m4
928rm -f %{buildroot}%{_libdir}/pkgconfig/mariadb.pc
929rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient*.so
930rm -f %{buildroot}%{_mandir}/man1/mysql_config.1*
931%endif
932
933%if %{without client}
934rm -f %{buildroot}%{_bindir}/{msql2mysql,mysql,mysql_find_rows,\
935mysql_plugin,mysql_waitpid,mysqlaccess,mysqladmin,mysqlbinlog,mysqlcheck,\
936mysqldump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}
937rm -f %{buildroot}%{_mandir}/man1/{msql2mysql,mysql,mysql_find_rows,\
938mysql_plugin,mysql_waitpid,mysqlaccess,mysqladmin,mysqlbinlog,mysqlcheck,\
939mysqldump,mysqlimport,mysqlshow,mysqlslap,my_print_defaults}.1*
940%endif
941
942%if %{without connect}
943rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/connect.cnf
944%endif
945
946%if %{without oqgraph}
947rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/oqgraph.cnf
948%endif
949
950%if %{without config}
951rm -f %{buildroot}%{_sysconfdir}/my.cnf
952rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/mysql-clients.cnf
953%endif
954
955%if %{without common}
956rm -rf %{buildroot}%{_datadir}/%{pkg_name}/charsets
957%endif
958
959%if %{without errmsg}
960rm -f %{buildroot}%{_datadir}/%{pkg_name}/errmsg-utf8.txt
961rm -rf %{buildroot}%{_datadir}/%{pkg_name}/{english,czech,danish,dutch,estonian,\
962french,german,greek,hungarian,italian,japanese,korean,norwegian,norwegian-ny,\
963polish,portuguese,romanian,russian,serbian,slovak,spanish,swedish,ukrainian}
964%endif
965
966%if %{without bench}
967rm -rf %{buildroot}%{_datadir}/sql-bench
968%endif
969
970%if %{without test}
971rm -f %{buildroot}%{_bindir}/{mysql_client_test,my_safe_process}
972rm -rf %{buildroot}%{_datadir}/mysql-test
973rm -f %{buildroot}%{_mandir}/man1/mysql_client_test.1*
974%endif
975
976%if %{without tokudb}
977rm -f %{buildroot}%{_sysconfdir}/my.cnf.d/cracklib_password_check.cnf
978%endif
979
980%check
981%if %{with test}
982%if %runselftest
983make test VERBOSE=1
984# hack to let 32- and 64-bit tests run concurrently on same build machine
985export MTR_PARALLEL=1
986# builds might happen at the same host, avoid collision
987export MTR_BUILD_THREAD=%{__isa_bits}
988
989# The cmake build scripts don't provide any simple way to control the
990# options for mysql-test-run, so ignore the make target and just call it
991# manually. Nonstandard options chosen are:
992# --force to continue tests after a failure
993# no retries please
994# test SSL with --ssl
995# skip tests that are listed in rh-skipped-tests.list
996# avoid redundant test runs with --binlog-format=mixed
997# increase timeouts to prevent unwanted failures during mass rebuilds
998(
999 set -e
1000 cd mysql-test
1001 perl ./mysql-test-run.pl --force --retry=0 --ssl \
1002 --suite-timeout=720 --testcase-timeout=30 --skip-rpl \
1003 --mysqld=--binlog-format=mixed --force-restart \
1004 --shutdown-timeout=60 --max-test-fail=0 \
1005%if %{ignore_testsuite_result}
1006 || :
1007%else
1008 --skip-test-list=rh-skipped-tests.list
1009%endif
1010 # cmake build scripts will install the var cruft if left alone :-(
1011 rm -rf var
1012)
1013%endif
1014%endif
1015
1016%pre server
1017/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
1018/usr/sbin/useradd -M -N -g mysql -o -r -d %{mysqluserhome} -s /sbin/nologin \
1019 -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
1020
1021%if %{with clibrary}
1022%post libs -p /sbin/ldconfig
1023%endif
1024
1025%if %{with embedded}
1026%post embedded -p /sbin/ldconfig
1027%endif
1028
1029%if %{with galera}
1030%post server-galera
1031semanage port -a -t mysqld_port_t -p tcp 4568 >/dev/null 2>&1 || :
1032semodule -i %{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp >/dev/null 2>&1 || :
1033%endif
1034
1035%post server
1036%if %{with init_systemd}
1037%systemd_post %{daemon_name}.service
1038%endif
1039%if %{with init_sysv}
1040if [ $1 = 1 ]; then
1041 /sbin/chkconfig --add %{daemon_name}
1042fi
1043%endif
1044
1045%preun server
1046%if %{with init_systemd}
1047%systemd_preun %{daemon_name}.service
1048%endif
1049%if %{with init_sysv}
1050if [ $1 = 0 ]; then
1051 /sbin/service %{daemon_name} stop >/dev/null 2>&1
1052 /sbin/chkconfig --del %{daemon_name}
1053fi
1054%endif
1055
1056%if %{with clibrary}
1057%postun libs -p /sbin/ldconfig
1058%endif
1059
1060%if %{with embedded}
1061%postun embedded -p /sbin/ldconfig
1062%endif
1063
1064%if %{with galera}
1065%postun server-galera
1066if [ $1 -eq 0 ]; then
1067 semodule -r %{name}-server-galera 2>/dev/null || :
1068fi
1069%endif
1070
1071%postun server
1072%if %{with init_systemd}
1073%systemd_postun_with_restart %{daemon_name}.service
1074%endif
1075%if %{with init_sysv}
1076if [ $1 -ge 1 ]; then
1077 /sbin/service %{daemon_name} condrestart >/dev/null 2>&1 || :
1078fi
1079%endif
1080
1081%if %{with client}
1082%files
1083%{_bindir}/msql2mysql
1084%{_bindir}/mysql
1085%{_bindir}/mysql_find_rows
1086%{_bindir}/mysql_plugin
1087%{_bindir}/mysql_waitpid
1088%{_bindir}/mysqlaccess
1089%{_bindir}/mysqladmin
1090%{_bindir}/mysqlbinlog
1091%{_bindir}/mysqlcheck
1092%{_bindir}/mysqldump
1093%{_bindir}/mysqlimport
1094%{_bindir}/mysqlshow
1095%{_bindir}/mysqlslap
1096%{_bindir}/my_print_defaults
1097
1098%{_mandir}/man1/msql2mysql.1*
1099%{_mandir}/man1/mysql.1*
1100%{_mandir}/man1/mysql_find_rows.1*
1101%{_mandir}/man1/mysql_plugin.1*
1102%{_mandir}/man1/mysql_waitpid.1*
1103%{_mandir}/man1/mysqlaccess.1*
1104%{_mandir}/man1/mysqladmin.1*
1105%{_mandir}/man1/mysqlbinlog.1*
1106%{_mandir}/man1/mysqlcheck.1*
1107%{_mandir}/man1/mysqldump.1*
1108%{_mandir}/man1/mysqlimport.1*
1109%{_mandir}/man1/mysqlshow.1*
1110%{_mandir}/man1/mysqlslap.1*
1111%{_mandir}/man1/my_print_defaults.1*
1112%endif
1113
1114%if %{with clibrary}
1115%files libs
1116%{_libdir}/mysql/libmysqlclient.so.*
1117%{_sysconfdir}/ld.so.conf.d/*
1118%config(noreplace) %{_sysconfdir}/my.cnf.d/client.cnf
1119%endif
1120
1121%if %{with config}
1122%files config
1123# although the default my.cnf contains only server settings, we put it in the
1124# common package because it can be used for client settings too.
1125%dir %{_sysconfdir}/my.cnf.d
1126%config(noreplace) %{_sysconfdir}/my.cnf
1127%config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf
1128%config(noreplace) %{_sysconfdir}/my.cnf.d/enable_encryption.preset
1129%endif
1130
1131%if %{with common}
1132%files common
1133%license COPYING
1134%license storage/innobase/COPYING.Percona storage/innobase/COPYING.Google
1135%doc README README.mysql-license README.mysql-docs
1136%dir %{_libdir}/mysql
1137%dir %{_libdir}/mysql/plugin
1138%dir %{_datadir}/%{pkg_name}
1139%{_libdir}/mysql/plugin/dialog.so
1140%{_libdir}/mysql/plugin/mysql_clear_password.so
1141%{_datadir}/%{pkg_name}/charsets
1142%endif
1143
1144%if %{with errmsg}
1145%files errmsg
1146%{_datadir}/%{pkg_name}/errmsg-utf8.txt
1147%{_datadir}/%{pkg_name}/english
1148%lang(cs) %{_datadir}/%{pkg_name}/czech
1149%lang(da) %{_datadir}/%{pkg_name}/danish
1150%lang(nl) %{_datadir}/%{pkg_name}/dutch
1151%lang(et) %{_datadir}/%{pkg_name}/estonian
1152%lang(fr) %{_datadir}/%{pkg_name}/french
1153%lang(de) %{_datadir}/%{pkg_name}/german
1154%lang(el) %{_datadir}/%{pkg_name}/greek
1155%lang(hu) %{_datadir}/%{pkg_name}/hungarian
1156%lang(it) %{_datadir}/%{pkg_name}/italian
1157%lang(ja) %{_datadir}/%{pkg_name}/japanese
1158%lang(ko) %{_datadir}/%{pkg_name}/korean
1159%lang(no) %{_datadir}/%{pkg_name}/norwegian
1160%lang(no) %{_datadir}/%{pkg_name}/norwegian-ny
1161%lang(pl) %{_datadir}/%{pkg_name}/polish
1162%lang(pt) %{_datadir}/%{pkg_name}/portuguese
1163%lang(ro) %{_datadir}/%{pkg_name}/romanian
1164%lang(ru) %{_datadir}/%{pkg_name}/russian
1165%lang(sr) %{_datadir}/%{pkg_name}/serbian
1166%lang(sk) %{_datadir}/%{pkg_name}/slovak
1167%lang(es) %{_datadir}/%{pkg_name}/spanish
1168%lang(sv) %{_datadir}/%{pkg_name}/swedish
1169%lang(uk) %{_datadir}/%{pkg_name}/ukrainian
1170%endif
1171
1172%if %{with galera}
1173%files server-galera
1174%doc Docs/README.wsrep
1175%license LICENSE.clustercheck
1176%{_bindir}/clustercheck
1177%if %{with init_systemd}
1178%{_bindir}/galera_new_cluster
1179%{_bindir}/galera_recovery
1180%{_datadir}/%{pkg_name}/systemd/use_galera_new_cluster.conf
1181%endif
1182%config(noreplace) %{_sysconfdir}/my.cnf.d/galera.cnf
1183%attr(0640,root,root) %ghost %config(noreplace) %{_sysconfdir}/sysconfig/clustercheck
1184%{_datadir}/selinux/packages/%{name}/%{name}-server-galera.pp
1185%endif
1186
1187%files server
1188%doc README.mysql-cnf
1189
1190%{_bindir}/aria_chk
1191%{_bindir}/aria_dump_log
1192%{_bindir}/aria_ftdump
1193%{_bindir}/aria_pack
1194%{_bindir}/aria_read_log
1195%{_bindir}/mariabackup
1196%{_bindir}/mariadb-service-convert
1197%{_bindir}/mbstream
1198%{_bindir}/myisamchk
1199%{_bindir}/myisam_ftdump
1200%{_bindir}/myisamlog
1201%{_bindir}/myisampack
1202%{_bindir}/mysql_convert_table_format
1203%{_bindir}/mysql_fix_extensions
1204%{_bindir}/mysql_install_db
1205%{_bindir}/mysql_secure_installation
1206%{_bindir}/mysql_setpermission
1207%{_bindir}/mysql_tzinfo_to_sql
1208%{_bindir}/mysql_upgrade
1209%{_bindir}/mysql_zap
1210%{_bindir}/mysqlbug
1211%{_bindir}/mysqldumpslow
1212%{_bindir}/mysqld_multi
1213%{_bindir}/mysqld_safe
1214%{_bindir}/mysqlhotcopy
1215%{_bindir}/mysqltest
1216%{_bindir}/innochecksum
1217%{_bindir}/perror
1218%{_bindir}/replace
1219%{_bindir}/resolve_stack_dump
1220%{_bindir}/resolveip
1221%{_bindir}/wsrep_sst_common
1222%{_bindir}/wsrep_sst_mariabackup
1223%{_bindir}/wsrep_sst_mysqldump
1224%{_bindir}/wsrep_sst_rsync
1225%{_bindir}/wsrep_sst_xtrabackup
1226%{_bindir}/wsrep_sst_xtrabackup-v2
1227%{?with_tokudb:%{_bindir}/tokuftdump}
1228%{?with_tokudb:%{_bindir}/tokuft_logprint}
1229
1230%config(noreplace) %{_sysconfdir}/my.cnf.d/%{pkg_name}-server.cnf
1231%config(noreplace) %{_sysconfdir}/my.cnf.d/auth_gssapi.cnf
1232%{?with_tokudb:%config(noreplace) %{_sysconfdir}/my.cnf.d/tokudb.cnf}
1233
1234%{_libexecdir}/mysqld
1235
1236%{_libdir}/mysql/INFO_SRC
1237%{_libdir}/mysql/INFO_BIN
1238%if %{without common}
1239%dir %{_datadir}/%{pkg_name}
1240%endif
1241
1242%{_libdir}/mysql/plugin/*
1243%{?with_oqgraph:%exclude %{_libdir}/mysql/plugin/ha_oqgraph.so}
1244%{?with_connect:%exclude %{_libdir}/mysql/plugin/ha_connect.so}
1245%exclude %{_libdir}/mysql/plugin/dialog.so
1246%exclude %{_libdir}/mysql/plugin/mysql_clear_password.so
1247
1248%{_mandir}/man1/aria_chk.1*
1249%{_mandir}/man1/aria_dump_log.1*
1250%{_mandir}/man1/aria_ftdump.1*
1251%{_mandir}/man1/aria_pack.1*
1252%{_mandir}/man1/aria_read_log.1*
1253%{_mandir}/man1/galera_new_cluster.1*
1254%{_mandir}/man1/galera_recovery.1*
1255%{_mandir}/man1/mariadb-service-convert.1*
1256%{_mandir}/man1/myisamchk.1*
1257%{_mandir}/man1/myisamlog.1*
1258%{_mandir}/man1/myisampack.1*
1259%{_mandir}/man1/mysql_convert_table_format.1*
1260%{_mandir}/man1/myisam_ftdump.1*
1261%{_mandir}/man1/mysql.server.1*
1262%{_mandir}/man1/mysql_fix_extensions.1*
1263%{_mandir}/man1/mysql_install_db.1*
1264%{_mandir}/man1/mysql_secure_installation.1*
1265%{_mandir}/man1/mysql_upgrade.1*
1266%{_mandir}/man1/mysql_zap.1*
1267%{_mandir}/man1/mysqlbug.1*
1268%{_mandir}/man1/mysqldumpslow.1*
1269%{_mandir}/man1/mysqld_multi.1*
1270%{_mandir}/man1/mysqld_safe.1*
1271%{_mandir}/man1/mysqld_safe_helper.1*
1272%{_mandir}/man1/my_safe_process.1*
1273%{_mandir}/man1/innochecksum.1*
1274%{_mandir}/man1/perror.1*
1275%{_mandir}/man1/replace.1*
1276%{_mandir}/man1/resolve_stack_dump.1*
1277%{_mandir}/man1/resolveip.1*
1278%{_mandir}/man1/mysql_tzinfo_to_sql.1*
1279%{_mandir}/man8/mysqld.8*
1280%{_mandir}/man1/wsrep_sst_common.1*
1281%{_mandir}/man1/wsrep_sst_mysqldump.1*
1282%{_mandir}/man1/wsrep_sst_rsync.1*
1283%{_mandir}/man1/wsrep_sst_xtrabackup.1*
1284%{_mandir}/man1/wsrep_sst_xtrabackup-v2.1*
1285
1286%{_datadir}/%{pkg_name}/fill_help_tables.sql
1287%{_datadir}/%{pkg_name}/install_spider.sql
1288%{_datadir}/%{pkg_name}/maria_add_gis_sp.sql
1289%{_datadir}/%{pkg_name}/maria_add_gis_sp_bootstrap.sql
1290%{_datadir}/%{pkg_name}/mysql_system_tables.sql
1291%{_datadir}/%{pkg_name}/mysql_system_tables_data.sql
1292%{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql
1293%{_datadir}/%{pkg_name}/mysql_to_mariadb.sql
1294%{_datadir}/%{pkg_name}/mysql_performance_tables.sql
1295%{?with_mroonga:%{_datadir}/%{pkg_name}/mroonga/install.sql}
1296%{?with_mroonga:%{_datadir}/%{pkg_name}/mroonga/uninstall.sql}
1297%{_datadir}/%{pkg_name}/my-*.cnf
1298%{_datadir}/%{pkg_name}/wsrep.cnf
1299%{_datadir}/%{pkg_name}/wsrep_notify
1300%dir %{_datadir}/%{pkg_name}/policy
1301%dir %{_datadir}/%{pkg_name}/policy/apparmor
1302%dir %{_datadir}/%{pkg_name}/policy/selinux
1303%{_datadir}/%{pkg_name}/policy/apparmor/README
1304%{_datadir}/%{pkg_name}/policy/apparmor/usr.sbin.mysqld*
1305%{_datadir}/%{pkg_name}/policy/selinux/README
1306%{_datadir}/%{pkg_name}/policy/selinux/mariadb-server.*
1307%{_datadir}/%{pkg_name}/policy/selinux/mariadb.*
1308%{_datadir}/%{pkg_name}/systemd/mariadb.service
1309# mariadb@ is installed only when we have cmake newer than 3.3
1310%if 0%{?fedora} > 22 || 0%{?rhel} > 6
1311%{_datadir}/%{pkg_name}/systemd/mariadb@.service
1312%endif
1313
1314%{daemondir}/%{daemon_name}*
1315%{_libexecdir}/mysql-prepare-db-dir
1316%{_libexecdir}/mysql-wait-ready
1317%{_libexecdir}/mysql-wait-stop
1318%{_libexecdir}/mysql-check-socket
1319%{_libexecdir}/mysql-check-upgrade
1320%{_libexecdir}/mysql-scripts-common
1321
1322%{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf}
1323%attr(0755,mysql,mysql) %dir %{pidfiledir}
1324%attr(0755,mysql,mysql) %dir %{dbdatadir}
1325%attr(0750,mysql,mysql) %dir %{logfiledir}
1326%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile}
1327%config(noreplace) %{logrotateddir}/%{daemon_name}
1328
1329%if %{with oqgraph}
1330%files oqgraph-engine
1331%config(noreplace) %{_sysconfdir}/my.cnf.d/oqgraph.cnf
1332%{_libdir}/mysql/plugin/ha_oqgraph.so
1333%endif
1334
1335%if %{with connect}
1336%files connect-engine
1337%config(noreplace) %{_sysconfdir}/my.cnf.d/connect.cnf
1338%{_libdir}/mysql/plugin/ha_connect.so
1339%endif
1340
1341%{_mandir}/man1/mysqlhotcopy.1*
1342%{_mandir}/man1/mysql_setpermission.1*
1343%{_mandir}/man1/mysqltest.1*
1344
1345# Other utilities
1346%{_bindir}/mysqld_safe_helper
1347
1348%if %{with devel}
1349%files devel
1350%{_bindir}/mysql_config*
1351%{_includedir}/mysql
1352%{_datadir}/aclocal/mysql.m4
1353%{_libdir}/pkgconfig/mariadb.pc
1354%if %{with clibrary}
1355%{_libdir}/mysql/libmysqlclient.so
1356%{_libdir}/mysql/libmysqlclient_r.so
1357%endif
1358%{_mandir}/man1/mysql_config.1*
1359%endif
1360
1361%if %{with embedded}
1362%files embedded
1363%{_libdir}/mysql/libmysqld.so.*
1364
1365%files embedded-devel
1366%{_libdir}/mysql/libmysqld.so
1367%{_bindir}/mysql_client_test_embedded
1368%{_bindir}/mysqltest_embedded
1369%{_mandir}/man1/mysql_client_test_embedded.1*
1370%{_mandir}/man1/mysqltest_embedded.1*
1371%endif
1372
1373%if %{with bench}
1374%files bench
1375%{_datadir}/sql-bench
1376%endif
1377
1378%if %{with test}
1379%files test
1380%{_bindir}/mysql_client_test
1381%{_bindir}/my_safe_process
1382%attr(-,mysql,mysql) %{_datadir}/mysql-test
1383%{_mandir}/man1/mysql_client_test.1*
1384%endif
1385
1386%changelog
1387* Tue Jan 10 2017 Michael Bayer <mbayer@redhat.com> - 3:10.1.20-1
1388- Update to version 10.1.20
1389- Add explicit EVR requirement in main package for -libs
1390 Related: #1406320
1391- Use correct macro when removing doc files
1392 Resolves: #1400981
1393- JdbcMariaDB.jar test removed
1394- PCRE version check added
1395 Related: #1382988, #1396945, #1096787
1396- added temporary support to build with OpenSSL 1.0 on Fedora >= 26
1397- added krb5-devel pkg as Buldrquires to prevent gssapi failure
1398
1399* Thu Nov 03 2016 Michele Baldessari <michele@acksyn.org> - 3:10.1.18-3
1400- Actually apply the revert added as patch in the previous release
1401
1402* Thu Nov 03 2016 Michele Baldessari <michele@acksyn.org> - 3:10.1.18-2
1403- Back out upstream commit 7497ebf8a49bfe30bb4110f2ac20a30f804b7946 as it
1404 breaks the resource agent
1405
1406* Tue Oct 4 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.18-1
1407- Update to 10.1.18
1408
1409* Wed Aug 31 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.17-1
1410- Update to 10.1.17
1411
1412* Mon Aug 29 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.16-2
1413- Fixed galera replication
1414 Resolves: #1352946
1415
1416* Tue Jul 19 2016 Jakub Dorňák <jdornak@redhat.com> - 3:10.1.16-1
1417- Update to 10.1.16
1418
1419* Fri Jul 15 2016 Honza Horak <hhorak@redhat.com> - 3:10.1.14-5
1420- Fail build when test-suite fails
1421- Use license macro for inclusion of licenses
1422
1423* Thu Jul 14 2016 Honza Horak <hhorak@redhat.com> - 3:10.1.14-4
1424- Revert Update to 10.1.15, this release is broken
1425 https://lists.launchpad.net/maria-discuss/msg03691.html
1426
1427* Thu Jul 14 2016 Honza Horak <hhorak@redhat.com> - 2:10.1.15-3
1428- Check datadir more carefully to avoid unwanted data corruption
1429 Related: #1335849
1430
1431* Thu Jul 7 2016 Jakub Dorňák <jdornak@redhat.com> - 2:10.1.15-2
1432- Bump epoch
1433 (related to the downgrade from the pre-release version)
1434
1435* Fri Jul 1 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.15-1
1436- Update to 10.1.15
1437
1438* Fri Jul 1 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.14-3
1439 Revert "Update to 10.2.0"
1440 It is possible that MariaDB 10.2.0 won't be stable till f25 GA.
1441
1442* Tue Jun 21 2016 Pavel Raiskup <praiskup@redhat.com> - 1:10.1.14-3
1443- BR multilib-rpm-config and use it for multilib workarounds
1444- install architecture dependant pc file to arch-dependant location
1445
1446* Thu May 26 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.2.0-2
1447- Fix mysql-prepare-db-dir
1448 Resolves: #1335849
1449
1450* Thu May 12 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.2.0-1
1451- Update to 10.2.0
1452
1453* Thu May 12 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.14-1
1454- Add selinux policy
1455- Update to 10.1.14 (includes various bug fixes)
1456- Add -h and --help options to galera_new_cluster
1457
1458* Thu Apr 7 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.13-3
1459- wsrep_on in galera.cnf
1460
1461* Tue Apr 5 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.13-2
1462- Moved /etc/sysconfig/clustercheck
1463 and /usr/share/mariadb/systemd/use_galera_new_cluster.conf
1464 to mariadb-server-galera
1465
1466* Tue Mar 29 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.13-1
1467- Update to 10.1.13
1468
1469* Wed Mar 23 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.12-4
1470- Fixed conflict with mariadb-galera-server
1471
1472* Tue Mar 22 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.12-3
1473- Add subpackage mariadb-server-galera
1474 Resolves: 1310622
1475
1476* Tue Mar 01 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.12-2
1477- Rebuild for BZ#1309199 (symbol versioning)
1478
1479* Mon Feb 29 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.12-1
1480- Update to 10.1.12
1481
1482* Tue Feb 16 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.11-9
1483- Remove dangling symlink to /etc/init.d/mysql
1484
1485* Sat Feb 13 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.11-8
1486- Use epoch for obsoleting mariadb-galera-server
1487
1488* Fri Feb 12 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.11-7
1489- Add Provides: bundled(pcre) in case we build with bundled pcre
1490 Related: #1302296
1491- embedded-devel should require libaio-devel
1492 Resolves: #1290517
1493
1494* Fri Feb 12 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.11-6
1495- Fix typo s/obsolate/obsolete/
1496
1497* Thu Feb 11 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.11-5
1498- Add missing requirements for proper wsrep functionality
1499- Obsolate mariadb-galera & mariadb-galera-server (thanks Tomas Repik)
1500 Resolves: #1279753
1501- Re-enable using libedit, which should be now fixed
1502 Related: #1201988
1503- Remove mariadb-wait-ready call from systemd unit, we have now systemd notify support
1504- Make mariadb@.service similar to mariadb.service
1505
1506* Mon Feb 08 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.11-4
1507- Use systemd unit file more compatible with upstream
1508
1509* Sun Feb 07 2016 Honza Horak <hhorak@redhat.com> - 1:10.1.11-3
1510- Temporarily disabling oqgraph for
1511 https://mariadb.atlassian.net/browse/MDEV-9479
1512
1513* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:10.1.11-2
1514- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
1515
1516* Wed Feb 3 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.11-1
1517- Update to 10.1.11
1518
1519* Tue Jan 19 2016 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.10-1
1520- Update to 10.1.10
1521
1522* Mon Dec 07 2015 Dan Horák <dan[at]danny.cz> - 1:10.1.8-3
1523- rebuilt for s390(x)
1524
1525* Tue Nov 03 2015 Honza Horak <hhorak@redhat.com> - 1:10.1.8-2
1526- Expand variables in server.cnf
1527
1528* Thu Oct 22 2015 Jakub Dorňák <jdornak@redhat.com> - 1:10.1.8-1
1529- Update to 10.1.8
1530
1531* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 1:10.0.21-2
1532- Rebuilt for Boost 1.59
1533
1534* Mon Aug 10 2015 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.21-1
1535- Update to 10.0.21
1536
1537* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.0.20-3
1538- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
1539
1540* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 1:10.0.20-2
1541- rebuild for Boost 1.58
1542
1543* Tue Jun 23 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.20-1
1544- Update to 10.0.20
1545
1546* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.0.19-3
1547- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
1548
1549* Wed Jun 03 2015 Dan Horák <dan[at]danny.cz> - 1:10.0.19-2
1550- Update lists of failing tests (jdornak)
1551 Related: #1149647
1552
1553* Mon May 11 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.19-1
1554- Update to 10.0.19
1555
1556* Thu May 07 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.18-1
1557- Update to 10.0.18
1558
1559* Thu May 07 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.17-4
1560- Include client plugins into -common package since they are used by both -libs
1561 and base packages.
1562- Do not use libedit
1563 Related: #1201988
1564- Let plugin dir to be owned by -common
1565- Use correct comment in the init script
1566 Related: #1184604
1567- Add openssl as BuildRequires to run some openssl tests during build
1568 Related: #1189180
1569- Fail in case any command in check fails
1570 Related: #1124791
1571- Fix mysqladmin crash if run with -u root -p
1572 Resolves: #1207170
1573
1574* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1:10.0.17-3
1575- Rebuilt for GCC 5 C++11 ABI change
1576
1577* Fri Mar 06 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.17-2
1578- Wait for daemon ends
1579 Resolves: #1072958
1580- Do not include symlink to libmysqlclient if not shipping the library
1581- Do not use scl prefix more than once in paths
1582 Based on https://www.redhat.com/archives/sclorg/2015-February/msg00038.html
1583
1584* Wed Mar 04 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.17-1
1585- Rebase to version 10.0.17
1586- Added variable for turn off skipping some tests
1587
1588* Tue Mar 03 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.16-6
1589- Check permissions when starting service on RHEL-6
1590 Resolves: #1194699
1591- Do not create test database by default
1592 Related: #1194611
1593
1594* Fri Feb 13 2015 Matej Muzila <mmuzila@redhat.com> - 1:10.0.16-4
1595- Enable tokudb
1596
1597* Tue Feb 10 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.16-3
1598- Fix openssl_1 test
1599
1600* Wed Feb 4 2015 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.16-2
1601- Include new certificate for tests
1602- Update lists of failing tests
1603 Related: #1186110
1604
1605* Tue Feb 3 2015 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.16-9
1606- Rebase to version 10.0.16
1607 Resolves: #1187895
1608
1609* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 1:10.0.15-9
1610- Rebuild for boost 1.57.0
1611
1612* Mon Jan 26 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.15-8
1613- Fix typo in the config file
1614
1615* Sun Jan 25 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.15-7
1616- Do not create log file in post script
1617
1618* Sat Jan 24 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.15-6
1619- Move server settings to config file under my.cnf.d dir
1620
1621* Sat Jan 24 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.15-5
1622- Fix path for sysconfig file
1623 Filter provides in el6 properly
1624 Fix initscript file location
1625
1626* Tue Jan 06 2015 Honza Horak <hhorak@redhat.com> - 1:10.0.15-4
1627- Disable failing tests connect.mrr, connect.updelx2 on ppc and s390
1628
1629* Mon Dec 22 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.15-3
1630- Fix macros paths in my.cnf
1631- Create old location for pid file if it remained in my.cnf
1632
1633* Fri Dec 05 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.15-2
1634- Rework usage of macros and remove some compatibility artefacts
1635
1636* Thu Nov 27 2014 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.15-1
1637- Update to 10.0.15
1638
1639* Thu Nov 20 2014 Jan Stanek <jstanek@redhat.com> - 1:10.0.14-8
1640- Applied upstream fix for mysql_config --cflags output.
1641 Resolves: #1160845
1642
1643* Fri Oct 24 2014 Jan Stanek <jstanek@redhat.com> - 1:10.0.14-7
1644- Fixed compat service file.
1645 Resolves: #1155700
1646
1647* Mon Oct 13 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.14-6
1648- Remove bundled cmd-line-utils
1649 Related: #1079637
1650- Move mysqlimport man page to proper package
1651- Disable main.key_cache test on s390
1652 Releated: #1149647
1653
1654* Wed Oct 08 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.14-5
1655- Disable tests connect.part_file, connect.part_table
1656 and connect.updelx
1657 Related: #1149647
1658
1659* Wed Oct 01 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.14-4
1660- Add bcond_without mysql_names
1661 Use more correct path when deleting mysql logrotate script
1662
1663* Wed Oct 01 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.14-3
1664- Build with system libedit
1665 Resolves: #1079637
1666
1667* Mon Sep 29 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.14-2
1668- Add with_debug option
1669
1670* Mon Sep 29 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.14-1
1671- Update to 10.0.14
1672
1673* Wed Sep 24 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-8
1674- Move connect engine to a separate package
1675 Rename oqgraph engine to align with upstream packages
1676- Move some files to correspond with MariaDB upstream packages
1677 client.cnf into -libs, mysql_plugin and msql2mysql into base,
1678 tokuftdump and aria_* into -server, errmsg-utf8.txt into -errmsg
1679- Remove duplicate cnf files packaged using %%doc
1680- Check upgrade script added to warn about need for mysql_upgrade
1681
1682* Wed Sep 24 2014 Matej Muzila <mmuzila@redhat.com> - 1:10.0.13-7
1683- Client related libraries moved from mariadb-server to mariadb-libs
1684 Related: #1138843
1685
1686* Mon Sep 08 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-6
1687- Disable vcol_supported_sql_funcs_myisam test on all arches
1688 Related: #1096787
1689- Install systemd service file on RHEL-7+
1690 Server requires any mysql package, so it should be fine with older client
1691
1692* Thu Sep 04 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-5
1693- Fix paths in mysql_install_db script
1694 Resolves: #1134328
1695- Use %%cmake macro
1696
1697* Tue Aug 19 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-4
1698- Build config subpackage everytime
1699- Disable failing tests: innodb_simulate_comp_failures_small, key_cache
1700 rhbz#1096787
1701
1702* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.0.13-3
1703- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
1704
1705* Thu Aug 14 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-2
1706- Include mysqld_unit only if required; enable tokudb in f20-
1707
1708* Wed Aug 13 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.13-1
1709- Rebase to version 10.0.13
1710
1711* Tue Aug 12 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.12-8
1712- Introduce -config subpackage and ship base config files here
1713
1714* Tue Aug 5 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.12-7
1715- Adopt changes from mysql, thanks Bjorn Munch <bjorn.munch@oracle.com>
1716
1717* Mon Jul 28 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.12-6
1718- Use explicit sysconfdir
1719- Absolut path for default value for pid file and error log
1720
1721* Tue Jul 22 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.12-5
1722- Hardcoded paths removed to work fine in chroot
1723- Spec rewrite to be more similar to oterh MySQL implementations
1724- Use variable for daemon unit name
1725- Include SysV init script if built on older system
1726- Add possibility to not ship some sub-packages
1727
1728* Mon Jul 21 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.12-4
1729- Reformating spec and removing unnecessary snippets
1730
1731* Tue Jul 15 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.12-3
1732- Enable OQGRAPH engine and package it as a sub-package
1733- Add support for TokuDB engine for x86_64 (currently still disabled)
1734- Re-enable tokudb_innodb_xa_crash again, seems to be fixed now
1735- Drop superfluous -libs and -embedded ldconfig deps (thanks Ville Skyttä)
1736- Separate -lib and -common sub-packages
1737- Require /etc/my.cnf instead of shipping it
1738- Include README.mysql-cnf
1739- Multilib support re-worked
1740- Introduce new option with_mysqld_unit
1741- Removed obsolete mysql-cluster, the package should already be removed
1742- Improve error message when log file is not writable
1743- Compile all binaries with full RELRO (RHBZ#1092548)
1744- Use modern symbol filtering with compatible backup
1745- Add more groupnames for server's my.cnf
1746- Error messages now provided by a separate package (thanks Alexander Barkov)
1747- Expand paths in helper scripts using cmake
1748
1749* Wed Jun 18 2014 Mikko Tiihonen <mikko.tiihonen@iki.fi> - 1:10.0.12-2
1750- Use -fno-delete-null-pointer-checks to avoid segfaults with gcc 4.9
1751
1752* Tue Jun 17 2014 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.12-1
1753- Rebase to version 10.0.12
1754
1755* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:10.0.11-5
1756- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
1757
1758* Tue Jun 3 2014 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.11-4
1759- rebuild with tests failing on different arches disabled (#1096787)
1760
1761* Thu May 29 2014 Dan Horák <dan[at]danny.cz> - 1:10.0.11-2
1762- rebuild with tests failing on big endian arches disabled (#1096787)
1763
1764* Wed May 14 2014 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.11-1
1765- Rebase to version 10.0.11
1766
1767* Mon May 05 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.10-3
1768- Script for socket check enhanced
1769
1770* Thu Apr 10 2014 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.10-2
1771- use system pcre library
1772
1773* Thu Apr 10 2014 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.10-1
1774- Rebase to version 10.0.10
1775
1776* Wed Mar 12 2014 Honza Horak <hhorak@redhat.com> - 1:5.5.36-2
1777- Server crashes on SQL select containing more group by and left join statements using innodb tables
1778 Resolves: #1065676
1779- Fix paths in helper scripts
1780- Move language files into mariadb directory
1781
1782* Thu Mar 06 2014 Honza Horak <hhorak@redhat.com> - 1:5.5.36-1
1783- Rebase to 5.5.36
1784 https://kb.askmonty.org/en/mariadb-5536-changelog/
1785
1786* Tue Feb 25 2014 Honza Horak <hhorak@redhat.com> 1:5.5.35-5
1787- Daemon helper scripts sanity changes and spec files clean-up
1788
1789* Tue Feb 11 2014 Honza Horak <hhorak@redhat.com> 1:5.5.35-4
1790- Fix typo in mysqld.service
1791 Resolves: #1063981
1792
1793* Wed Feb 5 2014 Honza Horak <hhorak@redhat.com> 1:5.5.35-3
1794- Do not touch the log file in post script, so it does not get wrong owner
1795 Resolves: #1061045
1796
1797* Thu Jan 30 2014 Honza Horak <hhorak@redhat.com> 1:5.5.35-1
1798- Rebase to 5.5.35
1799 https://kb.askmonty.org/en/mariadb-5535-changelog/
1800 Also fixes: CVE-2014-0001, CVE-2014-0412, CVE-2014-0437, CVE-2013-5908,
1801 CVE-2014-0420, CVE-2014-0393, CVE-2013-5891, CVE-2014-0386, CVE-2014-0401,
1802 CVE-2014-0402
1803 Resolves: #1054043
1804 Resolves: #1059546
1805
1806* Tue Jan 14 2014 Honza Horak <hhorak@redhat.com> - 1:5.5.34-9
1807- Adopt compatible system versioning
1808 Related: #1045013
1809- Use compatibility mysqld.service instead of link
1810 Related: #1014311
1811
1812* Mon Jan 13 2014 Rex Dieter <rdieter@fedoraproject.org> 1:5.5.34-8
1813- move mysql_config alternatives scriptlets to -devel too
1814
1815* Fri Jan 10 2014 Honza Horak <hhorak@redhat.com> 1:5.5.34-7
1816- Build with -O3 on ppc64
1817 Related: #1051069
1818- Move mysql_config to -devel sub-package and remove Require: mariadb
1819 Related: #1050920
1820
1821* Fri Jan 10 2014 Marcin Juszkiewicz <mjuszkiewicz@redhat.com> 1:5.5.34-6
1822- Disable main.gis-precise test also for AArch64
1823- Disable perfschema.func_file_io and perfschema.func_mutex for AArch64
1824 (like it is done for 32-bit ARM)
1825
1826* Fri Jan 10 2014 Honza Horak <hhorak@redhat.com> 1:5.5.34-5
1827- Clean all non-needed doc files properly
1828
1829* Wed Jan 8 2014 Honza Horak <hhorak@redhat.com> 1:5.5.34-4
1830- Read socketfile location in mariadb-prepare-db-dir script
1831
1832* Mon Jan 6 2014 Honza Horak <hhorak@redhat.com> 1:5.5.34-3
1833- Don't test EDH-RSA-DES-CBC-SHA cipher, it seems to be removed from openssl
1834 which now makes mariadb/mysql FTBFS because openssl_1 test fails
1835 Related: #1044565
1836- Use upstream's layout for symbols version in client library
1837 Related: #1045013
1838- Check if socket file is not being used by another process at a time
1839 of starting the service
1840 Related: #1045435
1841- Use %%ghost directive for the log file
1842 Related: 1043501
1843
1844* Wed Nov 27 2013 Honza Horak <hhorak@redhat.com> 1:5.5.34-2
1845- Fix mariadb-wait-ready script
1846
1847* Fri Nov 22 2013 Honza Horak <hhorak@redhat.com> 1:5.5.34-1
1848- Rebase to 5.5.34
1849
1850* Mon Nov 4 2013 Honza Horak <hhorak@redhat.com> 1:5.5.33a-4
1851- Fix spec file to be ready for backport by Oden Eriksson
1852 Resolves: #1026404
1853
1854* Mon Nov 4 2013 Honza Horak <hhorak@redhat.com> 1:5.5.33a-3
1855- Add pam-devel to build-requires in order to build
1856 Related: #1019945
1857- Check if correct process is running in mysql-wait-ready script
1858 Related: #1026313
1859
1860* Mon Oct 14 2013 Honza Horak <hhorak@redhat.com> 1:5.5.33a-2
1861- Turn on test suite
1862
1863* Thu Oct 10 2013 Honza Horak <hhorak@redhat.com> 1:5.5.33a-1
1864- Rebase to 5.5.33a
1865 https://kb.askmonty.org/en/mariadb-5533-changelog/
1866 https://kb.askmonty.org/en/mariadb-5533a-changelog/
1867- Enable outfile_loaddata test
1868- Disable tokudb_innodb_xa_crash test
1869
1870* Mon Sep 2 2013 Honza Horak <hhorak@redhat.com> - 1:5.5.32-12
1871- Re-organize my.cnf to include only generic settings
1872 Resolves: #1003115
1873- Move pid file location to /var/run/mariadb
1874- Make mysqld a symlink to mariadb unit file rather than the opposite way
1875 Related: #999589
1876
1877* Thu Aug 29 2013 Honza Horak <hhorak@redhat.com> - 1:5.5.32-11
1878- Move log file into /var/log/mariadb/mariadb.log
1879- Rename logrotate script to mariadb
1880- Resolves: #999589
1881
1882* Wed Aug 14 2013 Rex Dieter <rdieter@fedoraproject.org> 1:5.5.32-10
1883- fix alternatives usage
1884
1885* Tue Aug 13 2013 Honza Horak <hhorak@redhat.com> - 1:5.5.32-9
1886- Multilib issues solved by alternatives
1887 Resolves: #986959
1888
1889* Sat Aug 03 2013 Petr Pisar <ppisar@redhat.com> - 1:5.5.32-8
1890- Perl 5.18 rebuild
1891
1892* Wed Jul 31 2013 Honza Horak <hhorak@redhat.com> - 1:5.5.32-7
1893- Do not use login shell for mysql user
1894
1895* Tue Jul 30 2013 Honza Horak <hhorak@redhat.com> - 1:5.5.32-6
1896- Remove unneeded systemd-sysv requires
1897- Provide mysql-compat-server symbol
1898- Create mariadb.service symlink
1899- Fix multilib header location for arm
1900- Enhance documentation in the unit file
1901- Use scriptstub instead of links to avoid multilib conflicts
1902- Add condition for doc placement in F20+
1903
1904* Sun Jul 28 2013 Dennis Gilmore <dennis@ausil.us> - 1:5.5.32-5
1905- remove "Requires(pretrans): systemd" since its not possible
1906- when installing mariadb and systemd at the same time. as in a new install
1907
1908* Sat Jul 27 2013 Kevin Fenzi <kevin@scrye.com> 1:5.5.32-4
1909- Set rpm doc macro to install docs in unversioned dir
1910
1911* Fri Jul 26 2013 Dennis Gilmore <dennis@ausil.us> 1:5.5.32-3
1912- add Requires(pre) on systemd for the server package
1913
1914* Tue Jul 23 2013 Dennis Gilmore <dennis@ausil.us> 1:5.5.32-2
1915- replace systemd-units requires with systemd
1916- remove solaris files
1917
1918* Fri Jul 19 2013 Honza Horak <hhorak@redhat.com> 1:5.5.32-1
1919- Rebase to 5.5.32
1920 https://kb.askmonty.org/en/mariadb-5532-changelog/
1921- Clean-up un-necessary systemd snippets
1922
1923* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 1:5.5.31-7
1924- Perl 5.18 rebuild
1925
1926* Mon Jul 1 2013 Honza Horak <hhorak@redhat.com> 1:5.5.31-6
1927- Test suite params enhanced to decrease server condition influence
1928- Fix misleading error message when uninstalling built-in plugins
1929 Related: #966873
1930
1931* Thu Jun 27 2013 Honza Horak <hhorak@redhat.com> 1:5.5.31-5
1932- Apply fixes found by Coverity static analysis tool
1933
1934* Wed Jun 19 2013 Honza Horak <hhorak@redhat.com> 1:5.5.31-4
1935- Do not use pretrans scriptlet, which doesn't work in anaconda
1936 Resolves: #975348
1937
1938* Fri Jun 14 2013 Honza Horak <hhorak@redhat.com> 1:5.5.31-3
1939- Explicitly enable mysqld if it was enabled in the beginning
1940 of the transaction.
1941
1942* Thu Jun 13 2013 Honza Horak <hhorak@redhat.com> 1:5.5.31-2
1943- Apply man page fix from Jan Stanek
1944
1945* Fri May 24 2013 Honza Horak <hhorak@redhat.com> 1:5.5.31-1
1946- Rebase to 5.5.31
1947 https://kb.askmonty.org/en/mariadb-5531-changelog/
1948- Preserve time-stamps in case of installed files
1949- Use /var/tmp instead of /tmp, since the later is using tmpfs,
1950 which can cause problems
1951 Resolves: #962087
1952- Fix test suite requirements
1953
1954* Sun May 5 2013 Honza Horak <hhorak@redhat.com> 1:5.5.30-2
1955- Remove mytop utility, which is packaged separately
1956- Resolve multilib conflicts in mysql/private/config.h
1957
1958* Fri Mar 22 2013 Honza Horak <hhorak@redhat.com> 1:5.5.30-1
1959- Rebase to 5.5.30
1960 https://kb.askmonty.org/en/mariadb-5530-changelog/
1961
1962* Fri Mar 22 2013 Honza Horak <hhorak@redhat.com> 1:5.5.29-11
1963- Obsolete MySQL since it is now renamed to community-mysql
1964- Remove real- virtual names
1965
1966* Thu Mar 21 2013 Honza Horak <hhorak@redhat.com> 1:5.5.29-10
1967- Adding epoch to have higher priority than other mysql implementations
1968 when comes to provider comparison
1969
1970* Wed Mar 13 2013 Honza Horak <hhorak@redhat.com> 5.5.29-9
1971- Let mariadb-embedded-devel conflict with MySQL-embedded-devel
1972- Adjust mariadb-sortbuffer.patch to correspond with upstream patch
1973
1974* Mon Mar 4 2013 Honza Horak <hhorak@redhat.com> 5.5.29-8
1975- Mask expected warnings about setrlimit in test suite
1976
1977* Thu Feb 28 2013 Honza Horak <hhorak@redhat.com> 5.5.29-7
1978- Use configured prefix value instead of guessing basedir
1979 in mysql_config
1980Resolves: #916189
1981- Export dynamic columns and non-blocking API functions documented
1982 by upstream
1983
1984* Wed Feb 27 2013 Honza Horak <hhorak@redhat.com> 5.5.29-6
1985- Fix sort_buffer_length option type
1986
1987* Wed Feb 13 2013 Honza Horak <hhorak@redhat.com> 5.5.29-5
1988- Suppress warnings in tests and skip tests also on ppc64p7
1989
1990* Tue Feb 12 2013 Honza Horak <hhorak@redhat.com> 5.5.29-4
1991- Suppress warning in tests on ppc
1992- Enable fixed index_merge_myisam test case
1993
1994* Thu Feb 07 2013 Honza Horak <hhorak@redhat.com> 5.5.29-3
1995- Packages need to provide also %%_isa version of mysql package
1996- Provide own symbols with real- prefix to distinguish from mysql
1997 unambiguously
1998- Fix format for buffer size in error messages (MDEV-4156)
1999- Disable some tests that fail on ppc and s390
2000- Conflict only with real-mysql, otherwise mariadb conflicts with ourself
2001
2002* Tue Feb 05 2013 Honza Horak <hhorak@redhat.com> 5.5.29-2
2003- Let mariadb-libs to own /etc/my.cnf.d
2004
2005* Thu Jan 31 2013 Honza Horak <hhorak@redhat.com> 5.5.29-1
2006- Rebase to 5.5.29
2007 https://kb.askmonty.org/en/mariadb-5529-changelog/
2008- Fix inaccurate default for socket location in mysqld-wait-ready
2009 Resolves: #890535
2010
2011* Thu Jan 31 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-8
2012- Enable obsoleting mysql
2013
2014* Wed Jan 30 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-7
2015- Adding necessary hacks for perl dependency checking, rpm is still
2016 not wise enough
2017- Namespace sanity re-added for symbol default_charset_info
2018
2019* Mon Jan 28 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-6
2020- Removed %%{_isa} from provides/obsoletes, which doesn't allow
2021 proper obsoleting
2022- Do not obsolete mysql at the time of testing
2023
2024* Thu Jan 10 2013 Honza Horak <hhorak@redhat.com> 5.5.28a-5
2025- Added licenses LGPLv2 and BSD
2026- Removed wrong usage of %%{epoch}
2027- Test-suite is run in %%check
2028- Removed perl dependency checking adjustment, rpm seems to be smart enough
2029- Other minor spec file fixes
2030
2031* Tue Dec 18 2012 Honza Horak <hhorak@redhat.com> 5.5.28a-4
2032- Packaging of MariaDB based on MySQL package
2033
diff --git a/mariadb/centos/mariadb.spec.unmodified b/mariadb/centos/mariadb.spec.unmodified
deleted file mode 100644
index 0ed5cc9..0000000
--- a/mariadb/centos/mariadb.spec.unmodified
+++ /dev/null
@@ -1,1998 +0,0 @@
1# Prefix that is used for patches
2%global pkg_name %{name}
3%global pkgnamepatch mariadb
4
5# Regression tests may take a long time (many cores recommended), skip them by
6# passing --nocheck to rpmbuild or by setting runselftest to 0 if defining
7# --nocheck is not possible (e.g. in koji build)
8%{!?runselftest:%global runselftest 0}
9
10# Set this to 1 to see which tests fail, but 0 on production ready build
11%global ignore_testsuite_result 0
12
13# In f20+ use unversioned docdirs, otherwise the old versioned one
14%global _pkgdocdirname %{pkg_name}%{!?_pkgdocdir:-%{version}}
15%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{pkg_name}-%{version}}
16
17# Use Full RELRO for all binaries (RHBZ#1092548)
18%global _hardened_build 1
19
20# By default, patch(1) creates backup files when chunks apply with offsets.
21# Turn that off to ensure such files don't get included in RPMs (cf bz#884755).
22%global _default_patch_flags --no-backup-if-mismatch
23
24# TokuDB engine is now part of MariaDB, but it is available only for x86_64;
25# variable tokudb allows to build with TokuDB storage engine
26# Temporarily disabled in F21+ for https://mariadb.atlassian.net/browse/MDEV-6446
27%ifarch x86_64
28%bcond_without tokudb
29%else
30%bcond_with tokudb
31%endif
32
33# Mroonga engine is now part of MariaDB, but it only builds for x86_64;
34# variable mroonga allows to build with Mroonga storage engine
35%ifarch x86_64 i686
36%bcond_without mroonga
37%else
38%bcond_with mroonga
39%endif
40
41# The Open Query GRAPH engine (OQGRAPH) is a computation engine allowing
42# hierarchies and more complex graph structures to be handled in a relational
43# fashion; enabled by default
44# Temporarily disabling oqgraph: https://mariadb.atlassian.net/browse/MDEV-9479
45%bcond_with oqgraph
46
47# For some use cases we do not need some parts of the package
48%bcond_without clibrary
49%bcond_without embedded
50%bcond_without devel
51%bcond_without client
52%bcond_without common
53%bcond_without errmsg
54%bcond_without bench
55%bcond_without test
56%bcond_without connect
57%bcond_without galera
58
59# When there is already another package that ships /etc/my.cnf,
60# rather include it than ship the file again, since conflicts between
61# those files may create issues