[mariadb-galera] Rebase to version 10.0.15
Honza Horak
hhorak at fedoraproject.org
Sat Jan 24 22:45:29 UTC 2015
commit f45f9f09fa6dff4d33e55bf82ab4503d8c5ef593
Author: Honza Horak <hhorak at redhat.com>
Date: Sat Jan 24 23:45:46 2015 +0100
Rebase to version 10.0.15
.gitignore | 1 +
mariadb-cipherspec.patch | 115 --------------------------
mariadb-config.patch | 20 -----
mariadb-galera.spec | 173 +++++++++++++--------------------------
mariadb-scripts.patch | 4 +-
my.cnf.in | 4 +-
mysql-check-upgrade.sh | 2 +-
mysql-compat.conf.in | 6 --
mysql-compat.service.in | 12 ---
mysql.init.in | 4 +-
mysql.tmpfiles.d.in | 1 -
rh-skipped-tests-arm.list | 5 +-
rh-skipped-tests-base.list | 4 +
rh-skipped-tests-ppc-s390.list | 2 +
sources | 2 +-
15 files changed, 74 insertions(+), 281 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7cd1e5..6610eb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/mariadb-galera-5.5.38.tar.gz
/mariadb-galera-10.0.12.tar.gz
/mariadb-galera-10.0.13.tar.gz
+/mariadb-galera-10.0.15.tar.gz
diff --git a/mariadb-galera.spec b/mariadb-galera.spec
index 10ad62e..ca337ef 100644
--- a/mariadb-galera.spec
+++ b/mariadb-galera.spec
@@ -2,7 +2,7 @@
%global pkgname mariadb-galera
%global pkgnamepatch mariadb
-# Regression tests may take a long time (many cores recommended), skip them by
+# Regression tests may take a long time (many cores recommended), skip them by
# passing --nocheck to rpmbuild or by setting runselftest to 0 if defining
# --nocheck is not possible (e.g. in koji build)
%{!?runselftest:%global runselftest 1}
@@ -10,7 +10,7 @@
# In f20+ use unversioned docdirs, otherwise the old versioned one
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-# use Full RELRO for all binaries (RHBZ#1092548)
+# Use Full RELRO for all binaries (RHBZ#1092548)
%global _hardened_build 1
# By default, patch(1) creates backup files when chunks apply with offsets.
@@ -50,7 +50,8 @@
%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
%bcond_without init_systemd
%bcond_with init_sysv
-%global daemon_name mariadb
+%global daemon_name %{name}
+%global mysqld_pid_dir mysqld
%else
%bcond_with init_systemd
%bcond_without init_sysv
@@ -71,6 +72,9 @@
%global logfiledir %{_localstatedir}/log/%{daemon_name}
%global logfile %{logfiledir}/%{daemon_name}.log
+# Defining where database data live
+%global dbdatadir %{_localstatedir}/lib/mysql
+
# Home directory of mysql user should be same for all packages that create it
%global mysqluserhome /var/lib/mysql
@@ -80,31 +84,16 @@
# Provide mysql names for compatibility
%bcond_without mysql_names
-
-# When replacing mysql by mariadb these packages are not upated, but rather
-# installed and uninstalled. Thus we loose information about mysqld service
-# enablement. To address this we use a file to store that information within
-# the transaction. Basically the file is created when mysqld is enabled in
-# the beginning of the transaction and mysqld is enabled again in the end
-# of the transaction in case this flag file exists.
-%global mysqld_enabled_flag_file %{_localstatedir}/lib/rpm-state/mysqld_enabled
-%global mysqld_running_flag_file %{_localstatedir}/lib/rpm-state/mysqld_running
-
-# If we build without common subpackage, we want to use mariadb's common files
-%if %{with common}
-%global datadirname %{pkgname}
-%else
-%global datadirname mariadb
-%endif
+%bcond_without conflicts
# Make long macros shorter
%global sameevr %{epoch}:%{version}-%{release}
%global compatver 10.0
-%global bugfixver 13
+%global bugfixver 15
Name: %{pkgname}
Version: %{compatver}.%{bugfixver}
-Release: 7%{?with_debug:.debug}%{?dist}
+Release: 1%{?with_debug:.debug}%{?dist}
Epoch: 1
Summary: A community developed branch of MySQL
@@ -133,8 +122,6 @@ Source13: mysql-wait-ready.sh
Source14: mysql-check-socket.sh
Source15: mysql-scripts-common.sh
Source16: mysql-check-upgrade.sh
-Source17: mysql-compat.service.in
-Source18: mysql-compat.conf.in
Source19: mysql.init.in
Source50: rh-skipped-tests-base.list
Source51: rh-skipped-tests-intel.list
@@ -152,11 +139,10 @@ Patch1: %{pkgnamepatch}-strmov.patch
Patch2: %{pkgnamepatch}-install-test.patch
Patch3: %{pkgnamepatch}-s390-tsc.patch
Patch4: %{pkgnamepatch}-logrotate.patch
-Patch5: %{pkgnamepatch}-cipherspec.patch
-Patch6: %{pkgnamepatch}-file-contents.patch
-Patch7: %{pkgnamepatch}-dh1024.patch
-Patch8: %{pkgnamepatch}-scripts.patch
-Patch9: %{pkgnamepatch}-install-db-sharedir.patch
+Patch5: %{pkgnamepatch}-file-contents.patch
+Patch6: %{pkgnamepatch}-dh1024.patch
+Patch7: %{pkgnamepatch}-scripts.patch
+Patch8: %{pkgnamepatch}-install-db-sharedir.patch
# Patches specific for this mysql package
Patch30: %{pkgnamepatch}-errno.patch
@@ -164,7 +150,6 @@ Patch31: %{pkgnamepatch}-string-overflow.patch
Patch32: %{pkgnamepatch}-basedir.patch
Patch33: %{pkgnamepatch}-covscan-signexpr.patch
Patch34: %{pkgnamepatch}-covscan-stroverflow.patch
-Patch35: %{pkgnamepatch}-config.patch
Patch36: %{pkgnamepatch}-ssltest.patch
BuildRequires: cmake
@@ -213,8 +198,8 @@ Provides: mysql-compat-client%{?_isa} = %{sameevr}
# MySQL (with caps) is upstream's spelling of their own RPMs for mysql
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql < %{obsoleted_mysql_evr}}
-Conflicts: community-mysql
-Conflicts: mariadb
+%{?with_conflicts:Conflicts: community-mysql}
+%{?with_conflicts:Conflicts: mariadb}
# Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
%if 0%{?fedora} > 14 || 0%{?rhel} > 6
@@ -222,7 +207,7 @@ Conflicts: mariadb
%global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
%else
%filter_from_requires /perl(\(hostnames\|lib::mtr\|lib::v1\|mtr_\|My::\)/d
-%filter_provides_in -P (%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
+%filter_provides_in -P (%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\.so)
%filter_setup
%endif
@@ -337,8 +322,8 @@ Provides: mysql-compat-server = %{sameevr}
Provides: mysql-compat-server%{?_isa} = %{sameevr}
%endif
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-server < %{obsoleted_mysql_case_evr}}
-Conflicts: community-mysql-server
-Conflicts: mariadb-server
+%{?with_conflicts:Conflicts: community-mysql-server}
+%{?with_conflicts:Conflicts: mariadb-server}
%{?obsoleted_mysql_evr:Obsoletes: mysql-server < %{obsoleted_mysql_evr}}
%description server
@@ -394,8 +379,8 @@ Provides: mysql-devel%{?_isa} = %{sameevr}
%endif
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-devel < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-devel < %{obsoleted_mysql_evr}}
-Conflicts: community-mysql-devel
-Conflicts: mariadb-devel
+%{?with_conflicts:Conflicts: community-mysql-devel}
+%{?with_conflicts:Conflicts: mariadb-devel}
%description devel
MariaDB is a multi-user, multi-threaded SQL database server. This
@@ -423,7 +408,7 @@ Requires: mariadb-errmsg%{?_isa}
Provides: mysql-embedded = %{sameevr}
Provides: mysql-embedded%{?_isa} = %{sameevr}
%endif
-Conflicts: mariadb-embedded
+%{?with_conflicts:Conflicts: mariadb-embedded}
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded < %{obsoleted_mysql_evr}}
@@ -443,8 +428,8 @@ Requires: %{name}-devel%{?_isa} = %{sameevr}
Provides: mysql-embedded-devel = %{sameevr}
Provides: mysql-embedded-devel%{?_isa} = %{sameevr}
%endif
-Conflicts: community-mysql-embedded-devel
-Conflicts: mariadb-embedded-devel
+%{?with_conflicts:Conflicts: community-mysql-embedded-devel}
+%{?with_conflicts:Conflicts: mariadb-embedded-devel}
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded-devel < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr}}
@@ -465,8 +450,8 @@ Requires: %{name}%{?_isa} = %{sameevr}
Provides: mysql-bench = %{sameevr}
Provides: mysql-bench%{?_isa} = %{sameevr}
%endif
-Conflicts: community-mysql-bench
-Conflicts: mariadb-bench
+%{?with_conflicts:Conflicts: community-mysql-bench}
+%{?with_conflicts:Conflicts: mariadb-bench}
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-bench < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-bench < %{obsoleted_mysql_evr}}
@@ -504,8 +489,8 @@ Requires: perl(Time::HiRes)
Provides: mysql-test = %{sameevr}
Provides: mysql-test%{?_isa} = %{sameevr}
%endif
-Conflicts: community-mysql-test
-Conflicts: mariadb-test
+%{?with_conflicts:Conflicts: community-mysql-test}
+%{?with_conflicts:Conflicts: mariadb-test}
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-test < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-test < %{obsoleted_mysql_evr}}
@@ -527,46 +512,47 @@ MariaDB is a community developed branch of MySQL.
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
-%patch35 -p1
%patch36 -p1
+# removing bundled cmd-line-utils
+rm -r cmd-line-utils
+
sed -i -e 's/2.8.7/2.6.4/g' cmake/cpack_rpm.cmake
# workaround for upstream bug #56342
rm -f mysql-test/t/ssl_8k_key-master.opt
# generate a list of tests that fail, but are not disabled by upstream
-cat %{SOURCE50} > mysql-test/rh-skipped-tests.list
+cat %{SOURCE50} | tee mysql-test/rh-skipped-tests.list
# disable some tests failing on different architectures
%ifarch x86_64 i686
-cat %{SOURCE51} >> mysql-test/rh-skipped-tests.list
+cat %{SOURCE51} | tee -a mysql-test/rh-skipped-tests.list
%endif
%ifarch %{arm} aarch64
-cat %{SOURCE52} >> mysql-test/rh-skipped-tests.list
+cat %{SOURCE52} | tee -a mysql-test/rh-skipped-tests.list
%endif
%ifarch ppc ppc64 ppc64p7 s390 s390x
-cat %{SOURCE53} >> mysql-test/rh-skipped-tests.list
+cat %{SOURCE53} | tee -a mysql-test/rh-skipped-tests.list
%endif
%ifarch ppc64le
-cat %{SOURCE54} >> mysql-test/rh-skipped-tests.list
+cat %{SOURCE54} | tee -a mysql-test/rh-skipped-tests.list
%endif
%ifarch s390
-cat %{SOURCE55} >> mysql-test/rh-skipped-tests.list
+cat %{SOURCE55} | tee -a mysql-test/rh-skipped-tests.list
%endif
cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
- %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE17} %{SOURCE18} %{SOURCE19} \
+ %{SOURCE14} %{SOURCE15} %{SOURCE16} %{SOURCE19} \
%{SOURCE70} scripts
%build
@@ -612,13 +598,8 @@ export LDFLAGS
-DFEATURE_SET="community" \
-DINSTALL_LAYOUT=RPM \
-DDAEMON_NAME="%{daemon_name}" \
-%if 0%{?mysqld_unit:1}
- -DDAEMON_NAME_COMPAT="%{mysqld_unit}" \
-%endif
-DLOG_LOCATION="%{logfile}" \
- -DLOG_LOCATION_COMPAT="%{old_logfile}" \
-DPID_FILE_DIR="%{_localstatedir}/run/%{daemon_name}" \
- -DPID_FILE_DIR_COMPAT="%{_localstatedir}/run/%{mysqld_unit}" \
-DNICE_PROJECT_NAME="MariaDB" \
-DRPM="%{?rhel:rhel%{rhel}}%{!?rhel:fedora%{fedora}}" \
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
@@ -642,8 +623,8 @@ export LDFLAGS
-DINSTALL_SCRIPTDIR=bin \
-DINSTALL_SQLBENCHDIR=share \
-DINSTALL_SUPPORTFILESDIR=share/%{name} \
- -DMYSQL_DATADIR="%{_localstatedir}/lib/mysql" \
- -DMYSQL_UNIX_ADDR="%{_localstatedir}/lib/mysql/mysql.sock" \
+ -DMYSQL_DATADIR="%{dbdatadir}" \
+ -DMYSQL_UNIX_ADDR="/var/lib/mysql/mysql.sock" \
-DENABLED_LOCAL_INFILE=ON \
-DENABLE_DTRACE=ON \
-DWITH_EMBEDDED_SERVER=ON \
@@ -706,16 +687,12 @@ rm -rf %{buildroot}%{_pkgdocdir}/MariaDB-Galera-server-%{version}/
mkdir -p %{buildroot}%{logfiledir}
chmod 0750 %{buildroot}%{logfiledir}
touch %{buildroot}%{logfile}
-%if 0%{?old_logfile:1}
-ln -s %{logfile} %{buildroot}%{old_logfile}
-%endif
# current setting in my.cnf is to use /var/run/mariadb for creating pid file,
# however since my.cnf is not updated by RPM if changed, we need to create mysqld
# as well because users can have odd settings in their /etc/my.cnf
-%{?mysqld_unit:mkdir -p %{buildroot}%{_localstatedir}/run/%{mysqld_unit}}
mkdir -p %{buildroot}%{_localstatedir}/run/%{daemon_name}
-install -p -m 0755 -d %{buildroot}%{_localstatedir}/lib/mysql
+install -p -m 0755 -d %{buildroot}%{dbdatadir}
%if %{with config}
install -D -p -m 0644 scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
@@ -728,18 +705,14 @@ rm -f %{buildroot}%{_sysconfdir}/my.cnf
%if %{with init_systemd}
install -D -p -m 644 scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
install -D -p -m 0644 scripts/mysql.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
+%if 0%{?mysqld_pid_dir:1}
+echo "d %{_localstatedir}/run/%{mysqld_pid_dir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
%endif
-
-# install alternative systemd unit file for compatibility reasons
-%if 0%{?mysqld_unit:1}
-install -p -m 644 scripts/mysql-compat.service %{buildroot}%{_unitdir}/%{mysqld_unit}.service
-mkdir -p %{buildroot}%{_unitdir}/%{daemon_name}.service.d
-install -p -m 644 scripts/mysql-compat.conf %{buildroot}%{_unitdir}/%{daemon_name}.service.d/mysql-compat.conf
%endif
# install SysV init script
%if %{with init_sysv}
-install -D -p -m 755 scripts/mysql.init %{buildroot}%{_initddir}/%{daemon_name}
+install -D -p -m 755 scripts/mysql.init %{buildroot}%{daemondir}/%{daemon_name}
%endif
# helper scripts for service starting
@@ -912,34 +885,6 @@ export MTR_BUILD_THREAD=%{__isa_bits}
/usr/sbin/useradd -M -N -g mysql -o -r -d %{mysqluserhome} -s /sbin/nologin \
-c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
-%if %{with init_systemd}
-# Explicitly enable mysqld if it was enabled in the beginning
-# of the transaction. Otherwise mysqld is disabled always when
-# replacing mysql with mariadb, because it is not recognized
-# as updating, but rather as removal and install.
-if /bin/systemctl is-enabled mysqld.service >/dev/null 2>&1 ; then
- touch %mysqld_enabled_flag_file >/dev/null 2>&1 || :
-fi
-
-# Since mysqld.service became a symlink to mariadb.service, turning off
-# the running mysqld service doesn't work fine (BZ#1002996). As a work-around
-# we explicitly stop mysqld before upgrade and start after it again.
-if [ ! -L %{_unitdir}/mysqld.service ] && /bin/systemctl is-active mysqld.service &>/dev/null ; then
- touch %mysqld_running_flag_file >/dev/null 2>&1 || :
- /bin/systemctl stop mysqld.service >/dev/null 2>&1 || :
-fi
-
-%posttrans server
-if [ -f %mysqld_enabled_flag_file ] ; then
- /bin/systemctl enable %{daemon_name}.service >/dev/null 2>&1 || :
- rm -f %mysqld_enabled_flag_file >/dev/null 2>&1 || :
-fi
-if [ -f %mysqld_running_flag_file ] ; then
- /bin/systemctl start %{daemon_name}.service >/dev/null 2>&1 || :
- rm -f %mysqld_running_flag_file >/dev/null 2>&1 || :
-fi
-%endif
-
%if %{with clibrary}
%post libs -p /sbin/ldconfig
%endif
@@ -957,7 +902,8 @@ if [ $1 = 1 ]; then
/sbin/chkconfig --add %{daemon_name}
fi
%endif
-/bin/chmod 0755 %{_localstatedir}/lib/mysql
+/bin/touch %{logfile}
+/bin/chmod 0755 %{dbdatadir}
%preun server
%if %{with init_systemd}
@@ -1023,7 +969,6 @@ fi
%if %{with clibrary}
%files libs
-%dir %{_libdir}/mysql
%{_libdir}/mysql/libmysqlclient.so.*
%{_libdir}/mysql/plugin/dialog.so
%{_libdir}/mysql/plugin/mysql_clear_password.so
@@ -1035,8 +980,8 @@ fi
%files config
# although the default my.cnf contains only server settings, we put it in the
# common package because it can be used for client settings too.
-%config(noreplace) %{_sysconfdir}/my.cnf
%dir %{_sysconfdir}/my.cnf.d
+%config(noreplace) %{_sysconfdir}/my.cnf
%config(noreplace) %{_sysconfdir}/my.cnf.d/mysql-clients.cnf
%endif
@@ -1044,6 +989,7 @@ fi
%files common
%doc README COPYING COPYING.LESSER README.mysql-license
%doc storage/innobase/COPYING.Percona storage/innobase/COPYING.Google
+%dir %{_libdir}/mysql
%dir %{_datadir}/%{datadirname}
%{_datadir}/%{datadirname}/charsets
%endif
@@ -1136,11 +1082,11 @@ fi
%exclude %{_libdir}/mysql/plugin/dialog.so
%exclude %{_libdir}/mysql/plugin/mysql_clear_password.so
-%{_mandir}/man1/aria_chk.1.gz
-%{_mandir}/man1/aria_dump_log.1.gz
-%{_mandir}/man1/aria_ftdump.1.gz
-%{_mandir}/man1/aria_pack.1.gz
-%{_mandir}/man1/aria_read_log.1.gz
+%{_mandir}/man1/aria_chk.1*
+%{_mandir}/man1/aria_dump_log.1*
+%{_mandir}/man1/aria_ftdump.1*
+%{_mandir}/man1/aria_pack.1*
+%{_mandir}/man1/aria_read_log.1*
%{_mandir}/man1/myisamchk.1*
%{_mandir}/man1/myisamlog.1*
%{_mandir}/man1/myisampack.1*
@@ -1177,10 +1123,7 @@ fi
%{_datadir}/%{name}/wsrep.cnf
%{_datadir}/%{name}/wsrep_notify
-%{?mysqld_unit:%{_unitdir}/%{mysqld_unit}.service}
-%{?mysqld_unit:%{_unitdir}/%{daemon_name}.service.d/mysql-compat.conf}
-%{?with_init_systemd:%{_unitdir}/%{daemon_name}.service}
-%{?with_init_sysv:%{_initddir}/%{daemon_name}}
+%{daemondir}/%{daemon_name}
%{_libexecdir}/mysql-prepare-db-dir
%{_libexecdir}/mysql-wait-ready
%{_libexecdir}/mysql-check-socket
@@ -1190,12 +1133,9 @@ fi
%{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf}
%{?mysqld_unit:%attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{mysqld_unit}}
%attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{daemon_name}
-%attr(0755,mysql,mysql) %dir %{_localstatedir}/lib/mysql
+%attr(0755,mysql,mysql) %dir %{dbdatadir}
%attr(0750,mysql,mysql) %dir %{logfiledir}
%attr(0640,mysql,mysql) %config %ghost %verify(not md5 size mtime) %{logfile}
-%if 0%{?old_logfile:1}
- %config %ghost %verify(not md5 size mtime) %{old_logfile}
-%endif
%config(noreplace) %{logrotateddir}/%{daemon_name}
%if %{with oqgraph}
@@ -1247,6 +1187,9 @@ fi
%endif
%changelog
+* Sat Jan 24 2015 Honza Horak <hhorak at redhat.com> - 1:10.0.15-1
+- Rebase to version 10.0.15
+
* Thu Dec 4 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1:10.0.13-7
- Build on aarch64 now we have galera
diff --git a/mariadb-scripts.patch b/mariadb-scripts.patch
index c1f286b..171c0d6 100644
--- a/mariadb-scripts.patch
+++ b/mariadb-scripts.patch
@@ -1,7 +1,7 @@
diff -up mariadb-10.0.12/scripts/CMakeLists.txt.systemd mariadb-10.0.12/scripts/CMakeLists.txt
--- mariadb-10.0.12/scripts/CMakeLists.txt.systemd 2014-07-21 10:49:58.491470586 +0200
+++ mariadb-10.0.12/scripts/CMakeLists.txt 2014-07-21 14:21:22.673329708 +0200
-@@ -368,6 +368,35 @@ ELSE()
+@@ -368,6 +368,33 @@ ELSE()
COMPONENT ${${file}_COMPONENT}
)
ENDFOREACH()
@@ -17,8 +17,6 @@ diff -up mariadb-10.0.12/scripts/CMakeLists.txt.systemd mariadb-10.0.12/scripts/
+ mysql-scripts-common
+ mysql_config_multilib
+ mysql.init
-+ mysql-compat.service
-+ mysql-compat.conf
+ clustercheck
+ my.cnf
+ )
diff --git a/my.cnf.in b/my.cnf.in
index 660c40e..eff1259 100644
--- a/my.cnf.in
+++ b/my.cnf.in
@@ -17,8 +17,8 @@ symbolic-links=0
# @INSTALL_SYSCONF2DIR@/server.cnf (part of mariadb-server).
# It doesn't matter that we set these settings only for [mysqld] here,
# because they will be read and used in mysqld_safe as well.
-log-error=@LOG_LOCATION_COMPAT@
-pid-file=@PID_FILE_DIR_COMPAT@/@DAEMON_NAME_COMPAT at .pid
+log-error=@LOG_LOCATION@
+pid-file=@PID_FILE_DIR@/@DAEMON_NAME at .pid
[mysqld_safe]
diff --git a/mysql-check-upgrade.sh b/mysql-check-upgrade.sh
index 8fefe6b..9c8a8bd 100644
--- a/mysql-check-upgrade.sh
+++ b/mysql-check-upgrade.sh
@@ -29,7 +29,7 @@ The datadir located at $datadir needs to be upgraded using 'mysql_upgrade' tool.
1. Back-up your data before running 'mysql_upgrade'
2. Start the database daemon using 'systemctl start @DAEMON_NAME at .service'
- 3. Run 'mysql_upgrade' with a database user that has sufficent privileges
+ 3. Run 'mysql_upgrade' with a database user that has sufficient privileges
Read more about 'mysql_upgrade' usage at:
https://mariadb.com/kb/en/mariadb/documentation/sql-commands/table-commands/mysql_upgrade/
diff --git a/mysql.init.in b/mysql.init.in
index d6b43d3..be34fbf 100644
--- a/mysql.init.in
+++ b/mysql.init.in
@@ -34,7 +34,9 @@ STOPTIMEOUT=60
MYUSER=mysql
MYGROUP=mysql
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+# Edit the following file in order to re-write some of the environment
+# variables defined above, like $STARTTIMEOUT, $STOPTIMEOUT, $exec
+[ -e @sysconfdir@/sysconfig/$prog ] && . @sysconfdir@/sysconfig/$prog
lockfile=/var/lock/subsys/$prog
diff --git a/mysql.tmpfiles.d.in b/mysql.tmpfiles.d.in
index 937087a..d2c4b31 100644
--- a/mysql.tmpfiles.d.in
+++ b/mysql.tmpfiles.d.in
@@ -1,2 +1 @@
d @PID_FILE_DIR@ 0755 mysql mysql -
-d @PID_FILE_DIR_COMPAT@ 0755 mysql mysql -
diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list
index 635845c..061d0c5 100644
--- a/rh-skipped-tests-arm.list
+++ b/rh-skipped-tests-arm.list
@@ -8,8 +8,5 @@ perfschema.func_file_io : rhbz#773116 cycle counter does not work on arm
perfschema.func_mutex : rhbz#773116 cycle counter does not work on arm
connect.bin : rhbz#1096787 (pass on aarch64)
-main.gis-precise : rhbz#1096787 (pass on armv7hl)
-main.openssl_1 : rhbz#1096787
+main.key_cache : rhbz#1096787 (pass on aarch64)
perfschema.setup_objects : rhbz#1096787
-innodb.innodb_simulate_comp_failures_small : rhbz#1096787
-main.key_cache : rhbz#1096787
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index d144318..794bea7 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -1,7 +1,11 @@
# These tests fail with MariaDB 10:
main.func_str : rhbz#1096787
+main.openssl_1 : rhbz#1096787
+main.ssl : rhbz#1096787
+main.ssl_compress : rhbz#1096787
main.ssl_crl_clients : rhbz#1096787
+main.ssl_8k_key : rhbz#1096787
perfschema.nesting : rhbz#1096787
perfschema.socket_summary_by_event_name_func : rhbz#1096787
perfschema.socket_summary_by_instance_func : rhbz#1096787
diff --git a/rh-skipped-tests-ppc-s390.list b/rh-skipped-tests-ppc-s390.list
index e28c764..c484996 100644
--- a/rh-skipped-tests-ppc-s390.list
+++ b/rh-skipped-tests-ppc-s390.list
@@ -2,9 +2,11 @@ connect.alter : rhbz#1096787
connect.bin : rhbz#1096787
connect.dbf : rhbz#1096787
connect.index : rhbz#1096787
+connect.mrr : rhbz#1149647#c6
connect.part_file : rhbz#1149647
connect.part_table : rhbz#1149647
connect.updelx : rhbz#1149647
+connect.updelx2 : rhbz#1149647#c6
main.gis-precise : rhbz#1096787
main.statistics : rhbz#1096787
multi_source.skip_counter : rhbz#1096787
diff --git a/sources b/sources
index 0855658..e376e5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-efe28befea02afee96317b8b760f3706 mariadb-galera-10.0.13.tar.gz
+eaf628a5d4edba6a3e84c66403ebdde9 mariadb-galera-10.0.15.tar.gz
More information about the scm-commits
mailing list