rpms/mariadb10.11
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Adopt changes from mysql, thanks Bjorn Munch <bjorn.munch@oracle.com>

Browse Source
This commit is contained in:
Honza Horak 2014-08-05 14:20:26 +02:00
parent 7de9cfe709
commit 2a7a489639
5 changed files with 79 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.mysql-license
View File

@ -4,3 +4,6 @@ so long as the application is under a license approved by Oracle.
For details see For details see
http://www.mysql.com/about/legal/licensing/foss-exception/ http://www.mysql.com/about/legal/licensing/foss-exception/
Some innobase code from Percona and Google is under BSD license.
Some code related to test-suite is under LGPLv2.

2
mariadb-paths.patch
View File

@ -159,7 +159,7 @@ diff -up mariadb-10.0.12/scripts/CMakeLists.txt.patchs mariadb-10.0.12/scripts/C
SET(prefix "${CMAKE_INSTALL_PREFIX}") SET(prefix "${CMAKE_INSTALL_PREFIX}")
-SET(sysconfdir ${prefix}) -SET(sysconfdir ${prefix})
+SET(sysconfdir ${prefix}/${INSTALL_SYSCONFDIR}) +SET(sysconfdir ${INSTALL_SYSCONFDIR})
SET(bindir ${prefix}/${INSTALL_BINDIR}) SET(bindir ${prefix}/${INSTALL_BINDIR})
SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) SET(libexecdir ${prefix}/${INSTALL_SBINDIR})
SET(scriptdir ${prefix}/${INSTALL_BINDIR}) SET(scriptdir ${prefix}/${INSTALL_BINDIR})

138
mariadb.spec
View File

@ -1,5 +1,6 @@
# Name of the package without any prefixes # Name of the package without any prefixes
%global pkgname mariadb %global pkgname mariadb
%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 # passing --nocheck to rpmbuild or by setting runselftest to 0 if defining
@ -76,8 +77,8 @@
# We define some system's well known locations here so we can use them easily # We define some system's well known locations here so we can use them easily
# later when building to another location (like SCL) # later when building to another location (like SCL)
%global logrotateddir %{_sysconfdir}/logrotate.d %global logrotateddir %{_sysconfdir}/logrotate.d
%global logfiledir %{_localstatedir}/log/%{name} %global logfiledir %{_localstatedir}/log/%{daemon_name}
%global logfile %{logfiledir}/%{name}.log %global logfile %{logfiledir}/%{daemon_name}.log
%if 0%{?fedora} >= 20 %if 0%{?fedora} >= 20
%global old_logfile %{_localstatedir}/log/mysqld.log %global old_logfile %{_localstatedir}/log/mysqld.log
%endif %endif
@ -99,11 +100,13 @@
%global mysqld_running_flag_file %{_localstatedir}/lib/rpm-state/mysqld_running %global mysqld_running_flag_file %{_localstatedir}/lib/rpm-state/mysqld_running
# Make long macros shorter # Make long macros shorter
%global sameevp %{epoch}:%{version}-%{release} %global sameevr %{epoch}:%{version}-%{release}
%global compatver 10.0
%global bugfixver 12
Name: %{pkgname} Name: %{pkgname}
Version: 10.0.12 Version: %{compatver}.%{bugfixver}
Release: 6%{?dist} Release: 7%{?dist}
Epoch: 1 Epoch: 1
Summary: A community developed branch of MySQL Summary: A community developed branch of MySQL
@ -111,8 +114,6 @@ Group: Applications/Databases
URL: http://mariadb.org URL: http://mariadb.org
# Exceptions allow client libraries to be linked with most open source SW, # Exceptions allow client libraries to be linked with most open source SW,
# not only GPL code. See README.mysql-license # not only GPL code. See README.mysql-license
# Some innobase code from Percona and Google is under BSD license
# Some code related to test-suite is under LGPLv2
License: GPLv2 with exceptions and LGPLv2 and BSD License: GPLv2 with exceptions and LGPLv2 and BSD
Source0: http://mirrors.syringanetworks.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz Source0: http://mirrors.syringanetworks.net/mariadb/mariadb-%{version}/source/mariadb-%{version}.tar.gz
@ -140,25 +141,25 @@ Source54: rh-skipped-tests-ppc64le.list
# Comments for these patches are in the patch files # Comments for these patches are in the patch files
# Patches common for more mysql-like packages # Patches common for more mysql-like packages
Patch1: %{pkgname}-strmov.patch Patch1: %{pkgnamepatch}-strmov.patch
Patch2: %{pkgname}-install-test.patch Patch2: %{pkgnamepatch}-install-test.patch
Patch3: %{pkgname}-s390-tsc.patch Patch3: %{pkgnamepatch}-s390-tsc.patch
Patch4: %{pkgname}-logrotate.patch Patch4: %{pkgnamepatch}-logrotate.patch
Patch5: %{pkgname}-cipherspec.patch Patch5: %{pkgnamepatch}-cipherspec.patch
Patch6: %{pkgname}-file-contents.patch Patch6: %{pkgnamepatch}-file-contents.patch
Patch7: %{pkgname}-dh1024.patch Patch7: %{pkgnamepatch}-dh1024.patch
Patch8: %{pkgname}-scripts.patch Patch8: %{pkgnamepatch}-scripts.patch
Patch9: %{pkgname}-paths.patch Patch9: %{pkgnamepatch}-paths.patch
# Patches specific for this mysql package # Patches specific for this mysql package
Patch30: %{pkgname}-errno.patch Patch30: %{pkgnamepatch}-errno.patch
Patch31: %{pkgname}-string-overflow.patch Patch31: %{pkgnamepatch}-string-overflow.patch
Patch32: %{pkgname}-basedir.patch Patch32: %{pkgnamepatch}-basedir.patch
Patch33: %{pkgname}-covscan-signexpr.patch Patch33: %{pkgnamepatch}-covscan-signexpr.patch
Patch34: %{pkgname}-covscan-stroverflow.patch Patch34: %{pkgnamepatch}-covscan-stroverflow.patch
Patch35: %{pkgname}-config.patch Patch35: %{pkgnamepatch}-config.patch
Patch36: %{pkgname}-ssltest.patch Patch36: %{pkgnamepatch}-ssltest.patch
Patch37: %{pkgname}-mysql_config.patch Patch37: %{pkgnamepatch}-mysql_config.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: libaio-devel BuildRequires: libaio-devel
@ -190,12 +191,12 @@ BuildRequires: perl(Time::HiRes)
Requires: bash Requires: bash
Requires: fileutils Requires: fileutils
Requires: grep Requires: grep
Requires: %{name}-common%{?_isa} = %{sameevp} Requires: %{name}-common%{?_isa} = %{sameevr}
Provides: mysql = %{sameevp} Provides: mysql = %{sameevr}
Provides: mysql%{?_isa} = %{sameevp} Provides: mysql%{?_isa} = %{sameevr}
Provides: mysql-compat-client = %{sameevp} Provides: mysql-compat-client = %{sameevr}
Provides: mysql-compat-client%{?_isa} = %{sameevp} Provides: mysql-compat-client%{?_isa} = %{sameevr}
# MySQL (with caps) is upstream's spelling of their own RPMs for mysql # 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_case_evr:Obsoletes: MySQL < %{obsoleted_mysql_case_evr}}
@ -203,7 +204,7 @@ Provides: mysql-compat-client%{?_isa} = %{sameevp}
Conflicts: community-mysql Conflicts: community-mysql
# Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering # Filtering: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
%if 0%{?__requires_exclude:1} %if 0%{?fedora} > 14 || 0%{?rhel} > 6
%global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::) %global __requires_exclude ^perl\\((hostnames|lib::mtr|lib::v1|mtr_|My::)
%global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$ %global __provides_exclude_from ^(%{_datadir}/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
%else %else
@ -224,9 +225,9 @@ contains the standard MariaDB/MySQL client programs and generic MySQL files.
%package libs %package libs
Summary: The shared libraries required for MariaDB/MySQL clients Summary: The shared libraries required for MariaDB/MySQL clients
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-common%{?_isa} = %{sameevp} Requires: %{name}-common%{?_isa} = %{sameevr}
Provides: mysql-libs = %{sameevp} Provides: mysql-libs = %{sameevr}
Provides: mysql-libs%{?_isa} = %{sameevp} Provides: mysql-libs%{?_isa} = %{sameevr}
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-libs < %{obsoleted_mysql_case_evr}} %{?obsoleted_mysql_case_evr:Obsoletes: MySQL-libs < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-libs < %{obsoleted_mysql_evr}} %{?obsoleted_mysql_evr:Obsoletes: mysql-libs < %{obsoleted_mysql_evr}}
@ -256,7 +257,7 @@ You will need to install this package to use any other MariaDB package.
%package errmsg %package errmsg
Summary: The error messages files required by server and embedded Summary: The error messages files required by server and embedded
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-common%{?_isa} = %{sameevp} Requires: %{name}-common%{?_isa} = %{sameevr}
%description errmsg %description errmsg
The package provides error messages files for the MariaDB daemon and the The package provides error messages files for the MariaDB daemon and the
@ -271,12 +272,12 @@ Group: Applications/Databases
# note: no version here = %{version}-%{release} # note: no version here = %{version}-%{release}
Requires: mysql-compat-client%{?_isa} Requires: mysql-compat-client%{?_isa}
Requires: %{name}-common%{?_isa} = %{sameevp} Requires: %{name}-common%{?_isa} = %{sameevr}
%if %{without common} %if %{without common}
Requires: %{_sysconfdir}/my.cnf Requires: %{_sysconfdir}/my.cnf
Requires: %{_sysconfdir}/my.cnf.d Requires: %{_sysconfdir}/my.cnf.d
%endif %endif
Requires: %{name}-errmsg%{?_isa} = %{sameevp} Requires: %{name}-errmsg%{?_isa} = %{sameevr}
Requires: sh-utils Requires: sh-utils
Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/useradd
%if %{with init_systemd} %if %{with init_systemd}
@ -290,10 +291,10 @@ Requires(posttrans): systemd
# mysqlhotcopy needs DBI/DBD support # mysqlhotcopy needs DBI/DBD support
Requires: perl(DBI) Requires: perl(DBI)
Requires: perl(DBD::mysql) Requires: perl(DBD::mysql)
Provides: mysql-server = %{sameevp} Provides: mysql-server = %{sameevr}
Provides: mysql-server%{?_isa} = %{sameevp} Provides: mysql-server%{?_isa} = %{sameevr}
Provides: mysql-compat-server = %{sameevp} Provides: mysql-compat-server = %{sameevr}
Provides: mysql-compat-server%{?_isa} = %{sameevp} Provides: mysql-compat-server%{?_isa} = %{sameevr}
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-server < %{obsoleted_mysql_case_evr}} %{?obsoleted_mysql_case_evr:Obsoletes: MySQL-server < %{obsoleted_mysql_case_evr}}
Conflicts: community-mysql-server Conflicts: community-mysql-server
Conflicts: mariadb-galera-server Conflicts: mariadb-galera-server
@ -311,7 +312,7 @@ MariaDB is a community developed branch of MySQL.
%package oqgraph %package oqgraph
Summary: The Open Query GRAPH engine for MariaDB Summary: The Open Query GRAPH engine for MariaDB
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-server%{?_isa} = %{sameevp} Requires: %{name}-server%{?_isa} = %{sameevr}
# boost and Judy required for oograph # boost and Judy required for oograph
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: Judy-devel BuildRequires: Judy-devel
@ -329,10 +330,10 @@ standard SQL syntax, and results joined onto other tables.
%package devel %package devel
Summary: Files for development of MariaDB/MySQL applications Summary: Files for development of MariaDB/MySQL applications
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-libs%{?_isa} = %{sameevp} Requires: %{name}-libs%{?_isa} = %{sameevr}
Requires: openssl-devel%{?_isa} Requires: openssl-devel%{?_isa}
Provides: mysql-devel = %{sameevp} Provides: mysql-devel = %{sameevr}
Provides: mysql-devel%{?_isa} = %{sameevp} Provides: mysql-devel%{?_isa} = %{sameevr}
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-devel < %{obsoleted_mysql_case_evr}} %{?obsoleted_mysql_case_evr:Obsoletes: MySQL-devel < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-devel < %{obsoleted_mysql_evr}} %{?obsoleted_mysql_evr:Obsoletes: mysql-devel < %{obsoleted_mysql_evr}}
Conflicts: community-mysql-devel Conflicts: community-mysql-devel
@ -349,10 +350,10 @@ MariaDB is a community developed branch of MySQL.
%package embedded %package embedded
Summary: MariaDB as an embeddable library Summary: MariaDB as an embeddable library
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-common%{?_isa} = %{sameevp} Requires: %{name}-common%{?_isa} = %{sameevr}
Requires: %{name}-errmsg%{?_isa} = %{sameevp} Requires: %{name}-errmsg%{?_isa} = %{sameevr}
Provides: mysql-embedded = %{sameevp} Provides: mysql-embedded = %{sameevr}
Provides: mysql-embedded%{?_isa} = %{sameevp} Provides: mysql-embedded%{?_isa} = %{sameevr}
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded < %{obsoleted_mysql_case_evr}} %{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded < %{obsoleted_mysql_evr}} %{?obsoleted_mysql_evr:Obsoletes: mysql-embedded < %{obsoleted_mysql_evr}}
@ -366,10 +367,10 @@ MariaDB is a community developed branch of MySQL.
%package embedded-devel %package embedded-devel
Summary: Development files for MariaDB as an embeddable library Summary: Development files for MariaDB as an embeddable library
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}-embedded%{?_isa} = %{sameevp} Requires: %{name}-embedded%{?_isa} = %{sameevr}
Requires: %{name}-devel%{?_isa} = %{sameevp} Requires: %{name}-devel%{?_isa} = %{sameevr}
Provides: mysql-embedded-devel = %{sameevp} Provides: mysql-embedded-devel = %{sameevr}
Provides: mysql-embedded-devel%{?_isa} = %{sameevp} Provides: mysql-embedded-devel%{?_isa} = %{sameevr}
Conflicts: community-mysql-embedded-devel Conflicts: community-mysql-embedded-devel
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded-devel < %{obsoleted_mysql_case_evr}} %{?obsoleted_mysql_case_evr:Obsoletes: MySQL-embedded-devel < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr}} %{?obsoleted_mysql_evr:Obsoletes: mysql-embedded-devel < %{obsoleted_mysql_evr}}
@ -386,9 +387,9 @@ MariaDB is a community developed branch of MySQL.
%package bench %package bench
Summary: MariaDB benchmark scripts and data Summary: MariaDB benchmark scripts and data
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}%{?_isa} = %{sameevp} Requires: %{name}%{?_isa} = %{sameevr}
Provides: mysql-bench = %{sameevp} Provides: mysql-bench = %{sameevr}
Provides: mysql-bench%{?_isa} = %{sameevp} Provides: mysql-bench%{?_isa} = %{sameevr}
Conflicts: community-mysql-bench Conflicts: community-mysql-bench
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-bench < %{obsoleted_mysql_case_evr}} %{?obsoleted_mysql_case_evr:Obsoletes: MySQL-bench < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-bench < %{obsoleted_mysql_evr}} %{?obsoleted_mysql_evr:Obsoletes: mysql-bench < %{obsoleted_mysql_evr}}
@ -405,9 +406,9 @@ MariaDB is a community developed branch of MySQL.
%package test %package test
Summary: The test suite distributed with MariaD Summary: The test suite distributed with MariaD
Group: Applications/Databases Group: Applications/Databases
Requires: %{name}%{?_isa} = %{sameevp} Requires: %{name}%{?_isa} = %{sameevr}
Requires: %{name}-common%{?_isa} = %{sameevp} Requires: %{name}-common%{?_isa} = %{sameevr}
Requires: %{name}-server%{?_isa} = %{sameevp} Requires: %{name}-server%{?_isa} = %{sameevr}
Requires: perl(Env) Requires: perl(Env)
Requires: perl(Exporter) Requires: perl(Exporter)
Requires: perl(Fcntl) Requires: perl(Fcntl)
@ -420,8 +421,8 @@ Requires: perl(Sys::Hostname)
Requires: perl(Test::More) Requires: perl(Test::More)
Requires: perl(Time::HiRes) Requires: perl(Time::HiRes)
Conflicts: community-mysql-test Conflicts: community-mysql-test
Provides: mysql-test = %{sameevp} Provides: mysql-test = %{sameevr}
Provides: mysql-test%{?_isa} = %{sameevp} Provides: mysql-test%{?_isa} = %{sameevr}
%{?obsoleted_mysql_case_evr:Obsoletes: MySQL-test < %{obsoleted_mysql_case_evr}} %{?obsoleted_mysql_case_evr:Obsoletes: MySQL-test < %{obsoleted_mysql_case_evr}}
%{?obsoleted_mysql_evr:Obsoletes: mysql-test < %{obsoleted_mysql_evr}} %{?obsoleted_mysql_evr:Obsoletes: mysql-test < %{obsoleted_mysql_evr}}
@ -565,7 +566,7 @@ cmake . -DBUILD_CONFIG=mysql_release \
-DWITH_JEMALLOC=no \ -DWITH_JEMALLOC=no \
%{!?with_tokudb: -DWITHOUT_TOKUDB=ON}\ %{!?with_tokudb: -DWITHOUT_TOKUDB=ON}\
-DTMPDIR=/var/tmp \ -DTMPDIR=/var/tmp \
-DWITH_MYSQLD_LDFLAGS="-Wl,-z,relro,-z,now" %{?_hardened_build:-DWITH_MYSQLD_LDFLAGS="-pie -Wl,-z,relro,-z,now"}
make %{?_smp_mflags} VERBOSE=1 make %{?_smp_mflags} VERBOSE=1
@ -620,9 +621,9 @@ ln -s %{logfile} %{buildroot}%{old_logfile}
# current setting in my.cnf is to use /var/run/mariadb for creating pid file, # 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 # however since my.cnf is not updated by RPM if changed, we need to create mysqld
# as well because users can have od settings in their /etc/my.cnf # as well because users can have odd settings in their /etc/my.cnf
mkdir -p %{buildroot}%{_localstatedir}/run/mysqld mkdir -p %{buildroot}%{_localstatedir}/run/%{mysqld_unit}
mkdir -p %{buildroot}%{_localstatedir}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/run/%{daemon_name}
install -p -m 0755 -d %{buildroot}%{_localstatedir}/lib/mysql install -p -m 0755 -d %{buildroot}%{_localstatedir}/lib/mysql
%if %{ship_my_cnf} %if %{ship_my_cnf}
@ -877,8 +878,6 @@ fi
%endif %endif
%files %files
%doc README.mysql-docs
%if %{with client} %if %{with client}
%{_bindir}/msql2mysql %{_bindir}/msql2mysql
%{_bindir}/mysql %{_bindir}/mysql
@ -923,7 +922,7 @@ fi
%if %{with common} %if %{with common}
%files common %files common
%doc README COPYING COPYING.LESSER README.mysql-license %doc README COPYING COPYING.LESSER README.mysql-license README.mysql-docs
%doc storage/innobase/COPYING.Percona storage/innobase/COPYING.Google %doc storage/innobase/COPYING.Percona storage/innobase/COPYING.Google
# although the default my.cnf contains only server settings, we put it in the # 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. # common package because it can be used for client settings too.
@ -1055,7 +1054,7 @@ fi
%{_libexecdir}/mysql-scripts-common %{_libexecdir}/mysql-scripts-common
%{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf} %{?with_init_systemd:%{_tmpfilesdir}/%{name}.conf}
%attr(0755,mysql,mysql) %dir %{_localstatedir}/run/mysqld %attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{mysqld_unit}
%attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{daemon_name} %attr(0755,mysql,mysql) %dir %{_localstatedir}/run/%{daemon_name}
%attr(0755,mysql,mysql) %dir %{_localstatedir}/lib/mysql %attr(0755,mysql,mysql) %dir %{_localstatedir}/lib/mysql
%attr(0750,mysql,mysql) %dir %{logfiledir} %attr(0750,mysql,mysql) %dir %{logfiledir}
@ -1108,6 +1107,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Aug 5 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.12-7
- Adopt changes from mysql, thanks Bjorn Munch <bjorn.munch@oracle.com>
* Mon Jul 28 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.12-6 * Mon Jul 28 2014 Honza Horak <hhorak@redhat.com> - 1:10.0.12-6
- Use explicit sysconfdir - Use explicit sysconfdir
- Absolut path for default value for pid file and error log - Absolut path for default value for pid file and error log

2
mysql-prepare-db-dir.sh
View File

@ -69,7 +69,7 @@ if [ ! -d "$datadir/mysql" ] ; then
# Now create the database # Now create the database
echo "Initializing @NICE_PROJECT_NAME@ database" echo "Initializing @NICE_PROJECT_NAME@ database"
@bindir@/mysql_install_db --datadir="$datadir" --user="$myuser" @bindir@/mysql_install_db --rpm --datadir="$datadir" --user="$myuser"
ret=$? ret=$?
if [ $ret -ne 0 ] ; then if [ $ret -ne 0 ] ; then
echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2 echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2

8
mysql.init.in
View File

@ -39,7 +39,7 @@ MYGROUP=mysql
lockfile=/var/lock/subsys/$prog lockfile=/var/lock/subsys/$prog
# get options from my.cnf # get options from my.cnf
source "@libexecdir@/mariadb-scripts-common" source "@libexecdir@/mysql-scripts-common"
start(){ start(){
[ -x $exec ] || exit 5 [ -x $exec ] || exit 5
@ -62,8 +62,8 @@ start(){
action $"Starting $prog: " /bin/true action $"Starting $prog: " /bin/true
ret=0 ret=0
else else
@libexecdir@/mariadb-prepare-db-dir $MYUSER $MYGROUP || return 4 @libexecdir@/mysql-prepare-db-dir $MYUSER $MYGROUP || return 4
@libexecdir@/mariadb-check-socket || return 1 @libexecdir@/mysql-check-socket || return 1
# Pass all the options determined above, to ensure consistent behavior. # Pass all the options determined above, to ensure consistent behavior.
# In many cases mysqld_safe would arrive at the same conclusions anyway # In many cases mysqld_safe would arrive at the same conclusions anyway
@ -78,7 +78,7 @@ start(){
safe_pid=$! safe_pid=$!
# Wait until the daemon is up # Wait until the daemon is up
@libexecdir@/mariadb-wait-ready "$safe_pid" @libexecdir@/mysql-wait-ready "$safe_pid"
ret=$? ret=$?
if [ $ret -eq 0 ]; then if [ $ret -eq 0 ]; then