pool/mariadb
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- run spec cleaner on spec

Browse Source 
- update to 10.0.15
  * Release notes:
    http://kb.askmonty.org/v/mariadb-10015-release-notes
  * Changelog:
    http://kb.askmonty.org/v/mariadb-10015-changelog
- conditionally enable more storage engines
- updated packaging to the latest templates

OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=161
This commit is contained in:
Michal Hrusecky (old before rename to _miska_) 2014-12-06 13:56:41 +00:00 committed by Git OBS Bridge
parent 28d04d0271
commit 3b44ff4ed0
14 changed files with 248 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
README.debug
View File

@ -1,7 +1,7 @@
Debugging mysqld crashes
========================
Author: Michal Marek <mmarek@suse.cz>
Last modified: 2006-07-31
Last modified: 2014-11-21
Contents
--------
@ -67,22 +67,16 @@ packages and run
gdb /usr/sbin/mysqld /var/lib/mysql/core
(gdb) bt
Replace mysqld with the mysqld version you used (mysqld, mysqld-max or
mysqld-debug) and core with the actual name of the coredump.
Replace mysqld with the mysqld version you used (mysqld, mysqld-max)
and core with the actual name of the coredump.
3) Trace files
--------------
You'll need the mysqld-debug binary from the mysql-debug package to get
a trace file. Install the mysqld-debug package and the start mysqld
using following command:
Start mysqld using following command:
$ MYSQLD_DEBUG=yes rcmysql start
Note: The init script doesn't automatically pick up the mysqld-debug
binary (as it does with mysqld-max), because it is expected to be used
just temporarily to help solving a particular problem.
The init script will then start mysqld-debug and add the --core-file,
The init script will then start mysqld and add the --core-file,
--log and --debug options for you. The query log will be stored in
/var/lib/mysql/myqld-query.log
@ -92,9 +86,7 @@ and the trace file in
/var/lib/mysql/mysqld.trace
If you don't like the options set by the init script, just put your own
into /etc/my.cnf and the init script will honor it. For information
about the --debug option, see "The DBUG Package":
http://dev.mysql.com/doc/refman/5.0/en/the-dbug-package.html .
into /etc/my.cnf and the init script will honor them.
The trace file will contain various debug information and function
calls/returns and will become _extremly_ huge after a while, so don't

2
README.install
View File

@ -15,6 +15,6 @@ Alternatively you can run:
'/usr/bin/mysql_secure_installation'
which will also give you the option of removing the test
databases and anonymous user created by default. This is
databases and anonymous user created by default. This is
strongly recommended for production servers.

2
_constraints
View File

@ -1,7 +1,7 @@
<constraints>
<hardware>
<disk>
<size unit="G">9</size>
<size unit="G">11</size>
</disk>
</hardware>
</constraints>

170
build.inc
View File

@ -1,130 +1,48 @@
%if 0%{?suse_version} < 1120 && 0%{?suse_version} > 0
%define socketpath /var/lib/mysql
%else
%define socketpath /var/run/mysql
%endif
%if 0%{?suse_version} > 1140
export EXTRA_FLAGS=" -Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter "
%endif
EXTRA_FLAGS="-Wno-unused-but-set-variable -fno-strict-aliasing -Wno-unused-parameter"
# Mariadb devs seems to fall in love with -Werror option
EXTRA_FLAGS="${EXTRA_FLAGS} -Wno-error"
%ifarch ppc64
export EXTRA_FLAGS=" -mminimal-toc "
EXTRA_FLAGS="${EXTRA_FLAGS} -mminimal-toc"
%endif
export CFLAGS="$RPM_OPT_FLAGS -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS "
export CXXFLAGS="$CFLAGS"
%if 0%{use_cmake} < 1
autoreconf -f -i
# Make the compile a function, since we do multiple builds
BuildMySQL() {
# The --enable-assembler simply does nothing on systems that do not
# support assembler speedups.
suffix="$1"; shift
mkdir _build$suffix
pushd _build$suffix
../configure \
--enable-assembler \
--with-readline \
--infodir=%{_infodir} \
--libdir=%{_libdir} \
--libexecdir=/usr/sbin \
--localstatedir=/var/lib/mysql \
--mandir=%{_mandir} \
--prefix=%{_prefix} \
--sysconfdir=/etc \
--with-mysqld-user=mysql \
--with-mysqld-group=mysql \
--without-debug \
--datadir=/usr/share \
--includedir=/usr/include \
--with-charset=utf8 \
--with-collation=utf8_unicode_ci \
--with-extra-charsets=all \
--with-unix-socket-path=%{socketpath}/mysql.sock \
--enable-thread-safe-client \
--with-comment="SUSE MySQL RPM" \
--with-libwrap \
--with-server-suffix=$suffix \
%ifarch s390 s390x
--with-atomic-ops=rwlocks \
%else
--with-atomic-ops=smp \
export CFLAGS="%{optflags} -DOPENSSL_LOAD_CONF -DPIC -fPIC -DFORCE_INIT_OF_VARS $EXTRA_FLAGS"
export CXXFLAGS="$CFLAGS -felide-constructors"
%cmake -DWITH_SSL=system \
-DWITH_ZLIB=system \
-DWITH_LIBEVENT=system \
-DWITH_JEMALLOC=auto \
-DWITH_READLINE=0 \
-DWITH_LIBEDIT=0 \
-DINSTALL_LAYOUT=RPM \
-DMYSQL_UNIX_ADDR="%{_localstatedir}/run/mysql/mysql.sock" \
-DINSTALL_UNIX_ADDRDIR="%{_localstatedir}/run/mysql/mysql.sock" \
-DINSTALL_MYSQLSHAREDIR=share/%{name} \
-DWITH_COMMENT="openSUSE MySQL rpm" \
-DWITH_EXTRA_CHARSET=all \
-DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \
-DWITH_INNOBASE_STORAGE_ENGINE=1 \
-DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
%if %{with oqgraph}
-DWITH_OQGRAPH_STORAGE_ENGINE=1 \
%endif
--with-ssl=/usr \
--with-plugins=%{builtin_plugins} \
--without-plugin-handlersocket \
HOSTNAME="/bin/hostname -f" \
"$@"
# Add this for MyISAM RAID support:
# --with-raid
# benchdir does not fit in above model. Fix when we make a separate package
make %{?jobs:-j%jobs}
nm --numeric-sort sql/mysqld > sql/mysqld.sym
# needed for make check, which is not VPATH aware
# copy the files unconditionally so that manual 'make check' after
# the build works, too
cp -a ../mysql-test/* mysql-test/
for i in ../sql/share/{english,charsets}; do
[ -d $i ] && cp -a $i sql/share/
done
cp -a ../scripts/*.sql scripts/
%if %{?_with_testsuite:1}0
pushd mysql-test; perl ./mysql-test-run.pl --force; popd
%endif
popd
}
# Build the client, extra tools, libraries
%if 0%{?preferred} > 0
BuildMySQL "" --with-embedded-server
%else
BuildMySQL "" --without-embedded-server
%endif
# build mysqld-debug
BuildMySQL "-debug" --with-debug --without-embedded-server
%if 0%{?preferred} > 0
mkdir -p _buildlibmysqld/tmp
cd _buildlibmysqld/tmp
ar -x ../../_build/libmysqld/libmysqld.a
gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.0 -o ../libmysqld.so.0.0.1 \
*.o \
-lpthread -lcrypt -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
cd ..
rm -rf tmp
cd ..
%endif
%else # cmake build
BuildMySQL() {
mkdir _build$1
pushd _build$1
shift
cmake -DWITH_SSL=system \
-DWITH_ZLIB=system \
-DWITH_LIBEVENT=system \
-DWITH_JEMALLOC=no \
-DWITH_READLINE=0 \
-DWITH_LIBEDIT=0 \
-DINSTALL_LAYOUT=RPM \
-DMYSQL_UNIX_ADDR=%{socketpath}/mysql.sock \
-DINSTALL_MYSQLSHAREDIR=share/%{name} \
-DWITH_COMMENT="openSUSE MySQL rpm" \
-DWITH_EXTRA_CHARSET=all \
-DDEFAULT_CHARSET=utf8 -DDEFAULT_COLLATION=utf8_general_ci \
-DWITH_INNOBASE_STORAGE_ENGINE=1 \
-DWITH_PERFSCHEMA_STORAGE_ENGINE=1 \
-DWITH_EMBEDDED_SERVER=true \
-DCOMPILATION_COMMENT="openSUSE package" \
-DDENABLE_DOWNLOADS=false \
-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \
-DINSTALL_LIBDIR_RPM="%{_lib}" \
-Wno-dev "$@" ..
make %{?jobs:-j%jobs}
nm --numeric-sort sql/mysqld > sql/mysqld.sym
popd
}
BuildMySQL "" -DCMAKE_BUILD_TYPE=Release -DINSTALL_SQLBENCHDIR=share
# TokuDB can't be compiled without optimisations turned on
BuildMySQL "-debug" -DCMAKE_BUILD_TYPE=Debug -DWITHOUT_TOKUDB=1
%if %{with cassandra}
-DWITH_CASSANDRA_STORAGE_ENGINE=1 \
%endif
-DWITH_XTRADB_STORAGE_ENGINE=1 \
-DWITH_CSV_STORAGE_ENGINE=1 \
-DWITH_EMBEDDED_SERVER=true \
-DCOMPILATION_COMMENT="openSUSE package" \
-DDENABLE_DOWNLOADS=false \
-DINSTALL_PLUGINDIR_RPM="%{_lib}/mysql/plugin" \
-DINSTALL_LIBDIR_RPM="%{_lib}" \
-DINSTALL_SYSCONF2DIR="%{_sysconfdir}/my.cnf.d" \
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$CFLAGS" \
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$CXXFLAGS" \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DINSTALL_SQLBENCHDIR=share \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -pie -Wl,-z,relro,-z,now" \
-Wno-dev "$@" ..
make %{?_smp_mflags}
nm --numeric-sort sql/mysqld > sql/mysqld.sym

4
configuration-tweaks.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:861f2e1c5a96eb4a1b63268c9a5b33791178554385401955c15d99dcae8cd0c2
size 218
oid sha256:000e093b6d758ad1df72239727cc7c78e91f962a44999ce78779a5e22f158675
size 219

54
install.inc
View File

@ -1,11 +1,5 @@
# install the debug server first, so that we don't overwrite the standard
mkdir -p %buildroot%_libdir/mysql
make -C _build-debug/sql install DESTDIR=%buildroot
mv %buildroot/usr/sbin/mysqld %buildroot/usr/sbin/mysqld-debug
install -m 644 _build-debug/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld-debug.sym
# install the client, extra tools, libraries and the standard server
make -C _build install DESTDIR=%buildroot benchdir_root=/usr/share/
install -m 644 _build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
%cmake_install benchdir_root=/usr/share/
install -m 644 build/sql/mysqld.sym %buildroot%_libdir/mysql/mysqld.sym
# remove handler socket client
rm -f %buildroot%_libdir/libhsclient*
rm -f %buildroot%_bindir/hsclient*
@ -35,20 +29,27 @@ filelist()
if test -e usr/bin/"$i"; then
echo /usr/bin/"$i"
fi
if test -d usr/share/*/"$i"; then
echo "/`echo usr/share/*/"$i"`"
fi
if test -n "`ls -1 %buildroot$i 2> /dev/null`"; then
echo "$i"
fi
if ls usr/share/man/*/"$i".[1-9]* >/dev/null 2>&1; then
echo "%%doc %_mandir/*/$i.[1-9]*"
fi
done
popd >/dev/null
}
filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuftdump >mysql.files
filelist innochecksum my_print_defaults myisam_ftdump myisamchk myisamlog myisampack mysql_fix_extensions mysql_fix_privilege_tables mysql_install_db mysql_secure_installation mysql_upgrade mysqlbug mysqld mysqld_multi mysqld_safe mysqlbinlog mysqldumpslow mysqlmanager mroonga resolve_stack_dump resolveip {m,}aria_chk {m,}aria_dump_log {m,}aria_ftdump {m,}aria_pack {m,}aria_read_log xtstat tokuftdump >mysql.files
[ \! -d %buildroot/usr/share/*/mroonga ] || echo
filelist mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysql_config_editor >mysql-client.files
filelist mysql_config >libmysqlclient-devel.files
filelist mysql_config /usr/share/pkgconfig/mariadb.pc >libmysqlclient-devel.files
filelist mysqlslap >mysql-bench.files
filelist mysql_client_test mysql_client_test_embedded mysql_waitpid mysqltest mysqltest_embedded >mysql-test.files
# all binaries that don't need to be in a "default" install (mysql.rpm +
# mysql-client.rpm)
filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded %{name}_mytop hsclient >mysql-tools.files
filelist msql2mysql mysql_plugin mysql_convert_table_format mysql_find_rows mysql_setpermission mysql_tzinfo_to_sql mysql_zap mysqlaccess mysqlhotcopy perror replace mysql_embedded %{name}_mytop hsclient %{_bindir}/wsrep* /usr/share/mysql/wsrep_notify >mysql-tools.files
filelist ndbd ndbmtd ndbd_redo_log_reader >mysql-ndb-storage.files
filelist ndb_mgmd >mysql-ndb-management.files
filelist ndb_{config,desc,error_reporter,mgm,print_backup_file,print_schema_file,print_sys_file,restore,select_all,select_count,show_tables,size.pl,test_platform,waiter} >mysql-ndb-tools.files
@ -75,31 +76,18 @@ DOCS=(COPYING README EXCEPTIONS-CLIENT %_sourcedir/README.debug %_sourcedir/READ
DOCDIR=%buildroot%_defaultdocdir/%name
install -d -m 755 ${DOCDIR}
install -d -m 755 %buildroot/etc/logrotate.d
install -m 644 _build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql
%if 0%{?preferred} > 0%{?use_cmake}
install -m 644 _buildlibmysqld/*.so* %buildroot%_libdir
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so.0
ln -s libmysqld.so.0.0.1 %buildroot%_libdir/libmysqld.so
%endif
install -m 644 build/support-files/mysql-log-rotate %buildroot/etc/logrotate.d/mysql
install -m 660 %{S:14} %buildroot/etc/my.cnf
[ \! -f scripts/mysqlaccess.conf ] || install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf
for i in "${DOCS[@]}"; do
install -m 644 "${i}" "${DOCDIR}" || true
done
%if 0%{?use_systemd} > 0
install -D -m 755 %_sourcedir/rc.mysql.systemd '%buildroot'/usr/lib/mysql/rcmysql
sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/usr/lib/mysql/rcmysql
ln -sf service '%buildroot'/usr/sbin/rcmysql
install -D -m 644 %_sourcedir/mysql.service '%buildroot'/usr/lib/systemd/system/mysql.service
sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/usr/lib/mysql/rcmysql
rm -rf '%buildroot'/etc/init.d
%else
install -d -m 755 '%buildroot'/etc/init.d
install -m 755 '%_sourcedir'/rc.mysql.sysvinit '%buildroot'/etc/init.d/mysql
sed -i 's|@MYSQLVER@|%{version}|' '%buildroot'/etc/init.d/mysql
ln -sf ../../etc/init.d/mysql '%buildroot'/usr/sbin/rcmysql
sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql
%endif
# SuSEfirewall service description
install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \
%buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql
@ -109,26 +97,14 @@ install -m 755 suse-test-run '%buildroot'/usr/share/mysql-test/
mkdir '%buildroot'/usr/share/mysql-test/var
# Final fixes
find '%buildroot'/usr/share/mysql-test -name '*.orig' -delete
%if 0%{?suse_version} > 1030
%fdupes -s '%buildroot'/usr/share/mysql-test
%endif
%if 0%{?fedora_version} > 8
fdupes -q -n -r '%buildroot'/usr/share/mysql-test
%endif
dos2unixConversion() {
%{__sed} -i 's/\r//g' "$1"
}
for i in `grep -Rl '\r' '%buildroot'/usr/share/sql-bench`; do
dos2unixConversion "$i"
done
%if ! 0%{cluster} > 0
cat mysql-ndb-storage.files mysql-ndb-management.files \
mysql-ndb-tools.files mysql-ndb-extra.files | \
sed 's|^%%doc\ ||' | while read tmp; do
cd '%buildroot'
rm -f .$tmp
done
%endif
%if ! 0%{preferred} > 0
cat libmysqlclient-devel.files | sed 's|%%doc\ ||' | while read tmp; do
cd '%buildroot'
@ -143,10 +119,6 @@ rm -rf '%buildroot'/%_datadir/aclocal
ln -s mysqlcheck '%buildroot'%_bindir/mysqlrepair
ln -s mysqlcheck '%buildroot'%_bindir/mysqlanalyze
ln -s mysqlcheck '%buildroot'%_bindir/mysqloptimize
%if 0%{?cluster} > 1
ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6.0
ln -s libndbclient.so.6.0.0 '%buildroot'%_libdir/libndbclient.so.6
%endif
if [ -f '%buildroot'/usr/bin/mysqlaccess.conf ]; then
mv '%buildroot'/usr/bin/mysqlaccess.conf '%buildroot'/etc/mysqlaccess.conf
fi

3
mariadb-10.0.14.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:be067e9a9fadbf1f32d00485ad75ca4963ab3692d575e6a737b8975457d9f117
size 41139863

3
mariadb-10.0.15.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8
size 55531927

12
mariadb.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sat Dec 6 11:44:25 UTC 2014 - michal.hrusecky@opensuse.org
- run spec cleaner on spec
- update to 10.0.15
* Release notes:
http://kb.askmonty.org/v/mariadb-10015-release-notes
* Changelog:
http://kb.askmonty.org/v/mariadb-10015-changelog
- conditionally enable more storage engines
- updated packaging to the latest templates
-------------------------------------------------------------------
Sun Nov 09 18:53:00 UTC 2014 - Led <ledest@gmail.com>

442
mariadb.spec
View File

@ -15,36 +15,29 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# Few definitions which will alter build
%define preferred 01
%define use_systemd 01
%define use_cmake 01
%define cluster 00
%define have_info 0
%define builtin_plugins partition,csv,heap,aria,pbxt,myisam,myisammrg,xtradb
%define use_extra_provides 1
%define extra_provides mariadb_100
%define srv_vers 5.6.21
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
%if %{?rel:0}%{!?rel:1}
%define rel 1
%endif
#Distribution: %dist
#Packager: %packager
#Vendor: %vendor
%bcond_with jemalloc
%bcond_with oqgraph
%bcond_with cassandra
Name: mariadb
Version: 10.0.15
Release: 0
Summary: Server part of MariaDB
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Productivity/Databases/Servers
Version: 10.0.14
Release: 0
%define srv_vers 5.6.20
Url: https://www.mariadb.org
Source: mariadb-%{version}.tar.bz2
Source: https://downloads.mariadb.org/f/mariadb-%{version}/source/mariadb-%{version}.tar.gz
Source2: baselibs.conf
Source3: README.debug
Source4: suse-test-run
@ -60,76 +53,80 @@ Source14: my.ini
Source15: rc.mysql.sysvinit
Source16: rc.mysql.systemd
Source17: mysql.service
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
PreReq: pwdutils
%if %have_info
PreReq: %install_info_prereq %insserv_prereq
%endif
%endif
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
%if %{with oqgraph} || %{with cassandra}
BuildRequires: boost-devel
%endif
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
%if %{with jemalloc}
BuildRequires: jemalloc-devel
%endif
%if %{with oqgraph}
BuildRequires: judy-devel
%endif
BuildRequires: libaio-devel
BuildRequires: libbz2-devel
BuildRequires: libedit-devel
BuildRequires: libevent-devel
%if %{with cassandra}
BuildRequires: libthrift-devel
%endif
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: lzo-devel
BuildRequires: ncurses-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: procps
BuildRequires: readline-devel
BuildRequires: zlib-devel
%if 0%{?suse_version}
BuildRequires: pwdutils
BuildRequires: tcpd-devel
%endif
%if 0%{?suse_version} > 1030 || 0%{?fedora_version} > 8
BuildRequires: fdupes
%endif
%if 0%{?fedora_version} > 11
BuildRequires: readline-devel
BuildRequires: sqlite
%endif
%if 0%{?suse_version} > 1030
Recommends: logrotate
%else
Requires: logrotate
%endif
BuildRequires: tcpd-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig(systemd)
# required by rcmysql
Requires: %{name}-client
Requires: %{name}-errormessages = %version
%if 0%{?suse_version}
Requires: %{name}-errormessages = %{version}
Requires: perl-base
%else
Requires: perl
%endif
# systemd requirements for openSUSE >= 12.1
%if 0%{?suse_version} >= 1210
BuildRequires: pkgconfig(systemd)
%{?systemd_requires}
%endif
%if "%{name}" != mysql
Provides: mysql = %{srv_vers}
%endif
Requires(pre): pwdutils
Recommends: logrotate
Provides: mysql-Max = %{srv_vers}
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides} = %{version}
Obsoletes: %{extra_provides} < %{version}
%endif
%if 0%{?preferred} > 0
%if "%{name}" != mysql
Obsoletes: mysql < %{srv_vers}
%endif
Obsoletes: mysql-Max < %{srv_vers}
%endif
Conflicts: otherproviders(mysql)
# Compatibility with Fedora/CentOS
Provides: mysql-server = %{srv_vers}
Provides: mariadb-server = %{srv_vers}
# Compatibility with old version
Provides: %{name}-debug-version = %{srv_vers}
Obsoletes: %{name}-debug-version < %{srv_vers}
Provides: %{name}-debug = %{srv_vers}
Obsoletes: %{name}-debug < %{srv_vers}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Conflicts: otherproviders(mysql)
Conflicts: otherproviders(mysql-server)
Conflicts: otherproviders(mariadb-server)
Conflicts: otherproviders(mysql-debug)
%{?systemd_requires}
%if 0%{have_info} > 0
Requires(post): %{install_info_prereq} %insserv_prereq
%endif
%if "%{name}" != mysql
Provides: mysql = %{srv_vers}
Provides: mysql-debug = %{srv_vers}
%endif
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides} = %{version}
Obsoletes: %{extra_provides} < %{version}
Provides: %{extra_provides}-debug-version = %{version}
Obsoletes: %{extra_provides}-debug-version < %{version}
%endif
%if 0%{?preferred} > 0
Obsoletes: mysql-Max < %{srv_vers}
%if "%{name}" != mysql
Obsoletes: mysql < %{srv_vers}
Obsoletes: mysql-debug < %{srv_vers}
%endif
%endif
%description
MariaDB is a backward compatible, drop-in replacement branch of the MySQL
@ -140,16 +137,16 @@ This package only contains the server-side programs.
%if 0%{?preferred} > 0
%package -n libmysqlclient-devel
# mysql-devel was last used in openSUSE 10.2
Provides: mysql-devel = %srv_vers-%release
Obsoletes: mysql-devel < %srv_vers
Requires: glibc-devel
Requires: libmysqlclient18 = %version
Requires: libmysqlclient_r18 = %version
Requires: openssl-devel
Requires: zlib-devel
Summary: MariaDB development header files and libraries
Group: Development/Libraries/C and C++
Requires: glibc-devel
Requires: libmysqlclient_r18 = %{version}
Requires: libmysqlclient18 = %{version}
Requires: openssl-devel
Requires: zlib-devel
# mysql-devel was last used in openSUSE 10.2
Provides: mysql-devel = %{srv_vers}-%{release}
Obsoletes: mysql-devel < %{srv_vers}
%description -n libmysqlclient-devel
This package contains the development header files and libraries
@ -158,7 +155,7 @@ necessary to develop client applications for MariaDB.
%package -n libmysqld18
Summary: MariaDB embedded server development files
Group: Development/Libraries/C and C++
Requires: %{name}-errormessages = %version
Requires: %{name}-errormessages = %{version}
%description -n libmysqld18
This package contains the development header files and libraries
@ -168,8 +165,8 @@ for developing applications that embed the MariaDB.
Summary: MariaDB embedded server development files
Group: Development/Libraries/C and C++
# the headers files are the shared
Requires: libmysqlclient-devel = %version
Requires: libmysqld18 = %version
Requires: libmysqlclient-devel = %{version}
Requires: libmysqld18 = %{version}
Requires: tcpd-devel
%description -n libmysqld-devel
@ -197,23 +194,21 @@ languages and applications need to dynamically load and use MariaDB.
%package client
Summary: Client for MariaDB
Group: Productivity/Databases/Clients
Requires: %{name}-errormessages = %{version}
Conflicts: otherproviders(mysql-client)
%if "%{name}" != mysql
Provides: mysql-client = %{srv_vers}
%endif
%if 0%{?suse_version}
PreReq: pwdutils
%endif
Requires(pre): pwdutils
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-client = %{version}
Obsoletes: %{extra_provides}-client < %{version}
%endif
Requires: %{name}-errormessages = %version
%if 0%{?preferred} > 0
%if "%{name}" != mysql
Obsoletes: mysql-client < %{srv_vers}
%endif
%endif
Conflicts: otherproviders(mysql-client)
%description client
This package contains the standard clients for MariaDB.
@ -227,10 +222,11 @@ This package provides the translated error messages for the standalone
server daemon as well as the embedded server
%package bench
Requires: %{name}-client
Requires: perl-DBD-mysql
Summary: Benchmarks for MariaDB
Group: Productivity/Databases/Tools
Requires: %{name}-client
Requires: perl-DBD-mysql
Conflicts: otherproviders(mysql-bench)
%if "%{name}" != mysql
Provides: mysql-bench = %{srv_vers}
%endif
@ -243,36 +239,12 @@ Obsoletes: %{extra_provides}-bench < %{version}
Obsoletes: mysql-bench < %{srv_vers}
%endif
%endif
Conflicts: otherproviders(mysql-bench)
%description bench
This package contains benchmark scripts and data for MariaDB.
To run these database benchmarks, start the script "run-all-tests" in
the directory /usr/share/sql-bench after starting MariaDB.
%package debug-version
Summary: MariaDB with debug options turned on
Group: Productivity/Databases/Servers
Requires: %{name} = %{version}
Provides: %{name}-debug = %{srv_vers}
Provides: mysql-debug = %{srv_vers}
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-debug-verion = %{version}
Obsoletes: %{extra_provides}-debug-version < %{version}
%endif
%if 0%{?preferred} > 0
Obsoletes: mysql-debug < %{srv_vers}
%endif
Conflicts: otherproviders(mysql-debug)
%description debug-version
A version of the MariaDB that has some debug code turned on.
It should be only used to track down problems with the standard
servers. Note that merely installing this package will bot replace the
standard server. Read /usr/share/doc/packages/mysql/README.debug for
information on how to use the debug server.
the directory %{_datadir}/sql-bench after starting MariaDB.
%package test
Summary: Testsuite for MariaDB
@ -282,6 +254,7 @@ Requires: %{name}-bench = %{version}
Requires: %{name}-client = %{version}
Requires: %{name}-tools = %{version}
Requires: perl-DBD-mysql
Conflicts: otherproviders(mysql-test)
%if "%{name}" != mysql
Provides: mysql-test = %{srv_vers}
%endif
@ -294,23 +267,23 @@ Obsoletes: %{extra_provides}-test < %{version}
Obsoletes: mysql-test < %{srv_vers}
%endif
%endif
Conflicts: otherproviders(mysql-test)
%description test
This package contains the test scripts and data for MariaDB.
To run the testsuite, run /usr/share/mysql-test/suse-test-run.
To run the testsuite, run %{_datadir}/mysql-test/suse-test-run.
%package tools
Summary: MariaDB tools
Group: Productivity/Databases/Servers
Requires: perl-DBD-mysql
# make sure this package is installed when updating from 10.2 and older
Provides: mysql-client:/usr/bin/perror
Provides: mysql-client:%{_bindir}/perror
Provides: mysql:%{_bindir}/mysqlhotcopy
Conflicts: otherproviders(mysql-tools)
%if "%{name}" != mysql
Provides: mysql-tools = %{srv_vers}
%endif
Provides: mysql:/usr/bin/mysqlhotcopy
%if 0%{?use_extra_provides} > 0
Provides: %{extra_provides}-tools = %{version}
Obsoletes: %{extra_provides}-tools < %{version}
@ -320,88 +293,18 @@ Obsoletes: %{extra_provides}-tools < %{version}
Obsoletes: mysql-tools < %{srv_vers}
%endif
%endif
Conflicts: otherproviders(mysql-tools)
%description tools
A set of scripts for administering a MariaDB or developing
applications with MariaDB.
%if 0%{?cluster} > 0
%if 0%{?cluster} > 1
%package -n libndbclient6
Summary: Shared Libraries for cluster client
Group: Development/Libraries/Other
%description -n libndbclient6
This package contains the shared libraries (.so) which certain
languages and applications need to dynamically load and use MariaDB
cluster.
%endif
%package ndb-storage
Summary: MariaDB - ndbcluster storage engine
Group: Productivity/Databases/Servers
%if "%{name}" != mysql
Provides: mysql-ndb-storage = %{srv_vers}
Obsoletes: mysql-ndb-storage < %{srv_vers}
%endif
Conflicts: otherproviders(mysql-ndb-storage)
%description ndb-storage
This package contains the ndbcluster storage engine.
It is necessary to have this package installed on all
computers that should store ndbcluster table data.
%package ndb-management
Summary: MariaDB - ndbcluster storage engine management
Group: Productivity/Databases/Servers
%if "%{name}" != mysql
Provides: mysql-ndb-management = %{srv_vers}
Obsoletes: mysql-ndb-management < %{srv_vers}
%endif
Conflicts: otherproviders(mysql-ndb-management)
%description ndb-management
This package contains ndbcluster storage engine management.
It is necessary to have this package installed on at least
one computer in the cluster.
%package ndb-tools
Summary: MariaDB - ndbcluster storage engine basic tools
Group: Productivity/Databases/Servers
%if "%{name}" != mysql
Provides: mysql-ndb-tools = %{srv_vers}
Obsoletes: mysql-ndb-tools < %{srv_vers}
%endif
Conflicts: otherproviders(mysql-ndb-tools)
%description ndb-tools
This package contains ndbcluster storage engine basic tools.
%package ndb-extra
Summary: MariaDB - ndbcluster storage engine extra tools
Group: Productivity/Databases/Servers
%if "%{name}" != mysql
Provides: mysql-ndb-extra = %{srv_vers}
Obsoletes: mysql-ndb-extra < %{srv_vers}
%endif
Conflicts: otherproviders(mysql-ndb-extra)
%description ndb-extra
This package contains some extra ndbcluster storage engine tools for the
advanced user. They should be used with caution.
%endif
%prep
%setup -q -n mariadb-%{version} -D -a 9
cp %_sourcedir/README.SUSE .
cp %_sourcedir/suse-test-run .
cp %{_sourcedir}/README.SUSE .
cp %{_sourcedir}/suse-test-run .
# apply patches from series
mysql-patches/tools/quilt-setup.sh "%{S:12}"
mysql-patches/tools/apply-series.sh "%{S:12}"
mysql-patches/tools/quilt-setup.sh "%{SOURCE12}"
mysql-patches/tools/apply-series.sh "%{SOURCE12}"
# remove unneeded manpages ('make install' basically installs everything under
# man/*)
rm -f man/mysqlman.1 # dummy fallback manpage
@ -414,7 +317,7 @@ rm -f man/comp_err.1 # built-time utility
rm -f man/ndbd_redo_log_reader.1
# breaks VPATH builds when in sourcedir, is generated in the builddirs
rm -f sql/sql_builtin.cc
sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh
sed -i 's|@localstatedir@|%{_localstatedir}/log|' support-files/mysql-log-rotate.sh
%if 0%{preferred} < 1
for i in `grep -Rl mysqlclient .`; do
sed -i 's|mysqlclient|mysqlclient|g' $i
@ -425,78 +328,73 @@ done
rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
# Specify perl path on shebangs
for i in `grep -Rl '^#!@PERL@$' .`; do
sed -i 's|@PERL@|/usr/bin/perl|' $i
sed -i 's|@PERL@|%{_bindir}/perl|' $i
done
%build
%{expand:%(cat %_sourcedir/build.inc)}
%{expand:%(cat %{_sourcedir}/build.inc)}
%install
%{expand:%(cat %_sourcedir/install.inc)}
%{expand:%(cat %{_sourcedir}/install.inc)}
%pre
/usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || :
/usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \
-s /bin/false -d /var/lib/mysql mysql 2> /dev/null || :
/usr/sbin/usermod -g mysql -s /bin/false mysql 2> /dev/null || :
# systemd requirment
%if 0%{?suse_version} >= 1210
%{_sbindir}/groupadd -r mysql >/dev/null 2>/dev/null || :
%{_sbindir}/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \
-s /bin/false -d %{_localstatedir}/lib/mysql mysql 2> /dev/null || :
%{_sbindir}/usermod -g mysql -s /bin/false mysql 2> /dev/null || :
%service_add_pre mysql.service
%endif
%pre client
/usr/sbin/groupadd -r mysql >/dev/null 2>/dev/null || :
/usr/sbin/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \
-s /bin/false -d /var/lib/mysql mysql 2> /dev/null || :
/usr/sbin/usermod -g mysql -s /bin/false mysql 2> /dev/null || :
%{_sbindir}/groupadd -r mysql >/dev/null 2>/dev/null || :
%{_sbindir}/useradd -r -o -g mysql -u 60 -c "MySQL database admin" \
-s /bin/false -d %{_localstatedir}/lib/mysql mysql 2> /dev/null || :
%{_sbindir}/usermod -g mysql -s /bin/false mysql 2> /dev/null || :
%post
# systemd requirment
%if 0%{?suse_version} >= 1210
%service_add_post mysql.service
%endif
#######################################################################
# preun and posttran takes care of restart #
#######################################################################
%preun
[ $1 = 1 ] || /usr/sbin/rcmysql stop || true
[ $1 = 1 ] || %{_sbindir}/rcmysql stop || true
%pretrans -p <lua>
if posix.access("/usr/sbin/rcmysql", "x") then
restart = os.execute("/usr/sbin/rcmysql status > /dev/null")
if posix.access("%{_sbindir}/rcmysql", "x") then
restart = os.execute("%{_sbindir}/rcmysql status > /dev/null")
if restart == 0 then
os.execute("/usr/sbin/rcmysql stop")
os.execute("%{_sbindir}/rcmysql stop")
os.execute("/bin/mkdir -p %{_rundir}/mysql/restart")
end
end
%posttrans
%if %have_info
%if 0%{have_info} > 0
[ -z "`ls %{_infodir}/mysql.info.* 2> /dev/null`" ] || \
%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.*
%endif
if [ -d /var/lib/mysql ]; then
touch /var/lib/mysql/.run-mysql_upgrade
if [ -d %{_localstatedir}/lib/mysql ]; then
touch %{_localstatedir}/lib/mysql/.run-mysql_upgrade
fi
for in in protected tmp; do
rmdir /var/lib/mysql/.$i 2>/dev/null || :
rmdir %{_localstatedir}/lib/mysql/.$i 2>/dev/null || :
done
# start mysql again if it should run
if [ "`ls /etc/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d %{_rundir}/mysql/restart ]; then
[ -x /usr/sbin/rcmysql ] && /usr/sbin/rcmysql start
if [ "`ls %{_sysconfdir}/rc.d/rc*.d/S*mysql 2> /dev/null`" ] || [ -d %{_rundir}/mysql/restart ]; then
[ -x %{_sbindir}/rcmysql ] && %{_sbindir}/rcmysql start
# Might not be there, so ignoring errors
rmdir %{_rundir}/mysql/restart 2> /dev/null || :
fi
# warn on first run
datadir="/var/lib/mysql"
if [ -x /usr/bin/my_print_defaults ]; then
datadir="`/usr/bin/my_print_defaults mysqld mysql_server | sed -n 's|--datadir=||p'`"
[ "$datadir" ] || datadir="/var/lib/mysql"
datadir="%{_localstatedir}/lib/mysql"
if [ -x %{_bindir}/my_print_defaults ]; then
datadir="`%{_bindir}/my_print_defaults mysqld mysql_server | sed -n 's|--datadir=||p'`"
[ "$datadir" ] || datadir="%{_localstatedir}/lib/mysql"
fi
if [ \! -d "$datadir/mysql" ]; then
cat > /var/adm/update-messages/%{name}-%{version}-%{release} << EOF
%(cat %_sourcedir/README.install)
cat > %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} << EOF
%(cat %{_sourcedir}/README.install)
EOF
fi
@ -512,12 +410,6 @@ fi
%postun -n libmysqlclient_r18 -p /sbin/ldconfig
%if 0%{cluster} > 1
%post -n libndbclient6 -p /sbin/ldconfig
%postun -n libndbclient6 -p /sbin/ldconfig
%endif
%if 0%{preferred} > 0
%post -n libmysqld18 -p /sbin/ldconfig
@ -526,13 +418,13 @@ fi
%postun
if [ $1 = 0 ]; then
%if %have_info
%if 0%{have_info} > 0
%install_info_delete --info-dir=%{_infodir} %{_infodir}/mysql.info.*
%endif
%{insserv_cleanup}
rm -f "/var/lib/systemd/migrated/mysql.service"
if [ -x /usr/bin/systemctl ]; then
/usr/bin/systemctl daemon-reload >/dev/null 2>&1 || :
%insserv_cleanup
rm -f "%{_localstatedir}/lib/systemd/migrated/mysql.service"
if [ -x %{_bindir}/systemctl ]; then
%{_bindir}/systemctl daemon-reload >/dev/null 2>&1 || :
fi
fi
@ -542,35 +434,31 @@ fi
%files -f mysql.files
%defattr(-, root, root)
%config(noreplace) %attr(0640, root, mysql) /etc/my.cnf
%dir %attr(0750, root, mysql) /etc/my.cnf.d
%config(noreplace) %attr(0640, root, mysql) /etc/my.cnf.d/*
%config /etc/logrotate.d/mysql
%config(noreplace) %attr(0640, root, mysql) %{_sysconfdir}/my.cnf
%dir %attr(0750, root, mysql) %{_sysconfdir}/my.cnf.d
%config(noreplace) %attr(0640, root, mysql) %{_sysconfdir}/my.cnf.d/*
%config %{_sysconfdir}/logrotate.d/mysql
%doc %{_defaultdocdir}/%{name}
%if %have_info
%if 0%{have_info} > 0
%doc %{_infodir}/mysql.info.*
%endif
%if 0%{?use_systemd} > 0
%dir /usr/lib/mysql
/usr/lib/mysql/rcmysql
/usr/lib/systemd/system/mysql.service
%else
/etc/init.d/mysql
%endif
/usr/sbin/rcmysql
%dir /usr/share/%{name}
%dir /usr/share/mysql
/usr/share/%{name}/charsets/
/usr/share/%{name}/*.sql
%dir %{_libexecdir}/mysql
%{_libexecdir}/mysql/rcmysql
%{_libexecdir}/systemd/system/mysql.service
%{_sbindir}/rcmysql
%dir %{_datadir}/%{name}
%dir %{_datadir}/mysql
%{_datadir}/%{name}/charsets/
%{_datadir}/%{name}/*.sql
%dir %{_libdir}/mysql
%{_libdir}/mysql/mysqld.sym
%config /etc/sysconfig/SuSEfirewall2.d/services/mysql
%dir %_libdir/mysql/plugin
%_libdir/mysql/plugin/[!d]*.so
%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/mysql
%dir %{_libdir}/mysql/plugin
%{_libdir}/mysql/plugin/[!d]*.so
%files errormessages -f errormessages.files
%defattr(-, root, root)
/usr/share/%{name}/*/errmsg.sys
%{_datadir}/%{name}/*/errmsg.sys
%files client -f mysql-client.files
%defattr(-, root, root)
@ -578,70 +466,48 @@ fi
%if 0%{preferred} > 0
%files -n libmysqlclient-devel -f libmysqlclient-devel.files
%defattr(-, root, root)
/usr/include/mysql
%{_includedir}/mysql
%{_libdir}/libmysqlclient.so
%{_libdir}/libmysqlclient_r.so
%dir /usr/share/aclocal
/usr/share/aclocal/mysql.m4
%dir %{_datadir}/aclocal
%{_datadir}/aclocal/mysql.m4
%files -n libmysqld-devel
%defattr(-,root,root)
%_libdir/libmysqld.a
%_libdir/libmysqld.so
%{_libdir}/libmysqld.a
%{_libdir}/libmysqld.so
%files -n libmysqld18
%defattr(-,root,root)
%_libdir/libmysqld.so.*
%{_libdir}/libmysqld.so.*
%endif
%files -n libmysqlclient18
%defattr(-, root, root)
%{_libdir}/libmysqlclient.so.*
%if 0%{cluster} > 1
%files -n libndbclient6
%defattr(-, root, root)
%{_libdir}/libndbclient.so.*
%endif
%files -n libmysqlclient_r18
%defattr(-, root, root)
%{_libdir}/libmysqlclient_r.so.*
%files bench -f mysql-bench.files
%defattr(-, root, root)
/usr/share/sql-bench
%files debug-version
%defattr(-, root, root)
/usr/sbin/mysqld-debug
%{_libdir}/mysql/mysqld-debug.sym
%{_datadir}/sql-bench
%files test -f mysql-test.files
%defattr(-, root, root)
%{_bindir}/my_safe_process
%_mandir/man1/mysql-test-run.pl.1*
%_mandir/man1/mysql-stress-test.pl.1*
/usr/share/mysql-test/valgrind.supp
%dir %attr(755, root, root)/usr/share/mysql-test
/usr/share/mysql-test/[^v]*
%dir %attr(755, mysql, mysql) /usr/share/mysql-test/var
%{_mandir}/man1/mysql-test-run.pl.1*
%{_mandir}/man1/mysql-stress-test.pl.1*
%{_datadir}/mysql-test/valgrind.supp
%dir %attr(755, root, root)%{_datadir}/mysql-test
%{_datadir}/mysql-test/[^v]*
%dir %attr(755, mysql, mysql) %{_datadir}/mysql-test/var
%files tools -f mysql-tools.files
%defattr(-, root, root)
%_bindir/mysqlrepair
%_bindir/mysqlanalyze
%_bindir/mysqloptimize
%if 0%{cluster} > 0
%files ndb-storage -f mysql-ndb-storage.files
%files ndb-management -f mysql-ndb-management.files
%files ndb-tools -f mysql-ndb-tools.files
%files ndb-extra -f mysql-ndb-extra.files
%endif
%{_bindir}/mysqlrepair
%{_bindir}/mysqlanalyze
%{_bindir}/mysqloptimize
%changelog

4
mysql-patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4bdfe7f2ac1d759c8ef4e0f05d7b4688685b572f833b66e6b05f14b152a3e6d
size 24164
oid sha256:02c61051825891fbada58946b83323752bd0efbc0867bed0d98c1671e62255cd
size 25221

7
rc.mysql.systemd
View File

@ -301,9 +301,9 @@ else
unset MYSQLD
# use mysqld-debug only if explicitly requested (TODO: sysconfig variable?)
if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld-debug
if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld
then
MYSQLD=/usr/sbin/mysqld-debug
MYSQLD=/usr/sbin/mysqld
elif test -x /usr/sbin/mysqld-max
then
MYSQLD=/usr/sbin/mysqld-max
@ -502,8 +502,7 @@ else
}
echo "Running protected MySQL... " | tee -a "$log_upgrade"
$SAFE_MYSQLD \
--mysqld=${MYSQLD#/usr/sbin/} \
$MYSQLD \
$debug_flags \
--skip-networking \
--skip-grant-tables \

7
rc.mysql.sysvinit
View File

@ -251,9 +251,9 @@ else
unset MYSQLD
# use mysqld-debug only if explicitly requested (TODO: sysconfig variable?)
if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld-debug
if test "$MYSQLD_DEBUG" = yes -a -x /usr/sbin/mysqld
then
MYSQLD=/usr/sbin/mysqld-debug
MYSQLD=/usr/sbin/mysqld
elif test -x /usr/sbin/mysqld-max
then
MYSQLD=/usr/sbin/mysqld-max
@ -452,8 +452,7 @@ else
}
echo "Running protected MySQL... " | tee -a "$log_upgrade"
$SAFE_MYSQLD \
--mysqld=${MYSQLD#/usr/sbin/} \
$MYSQLD \
$debug_flags \
--skip-networking \
--skip-grant-tables \

7
series
View File

@ -4,14 +4,15 @@ mysql-community-server-5.1.46-logrotate.patch
mariadb-5.1.50-strncat-overflow.patch
mariadb-5.5.28-install_db-quiet.patch
mysql-community-server-5.1.51-mysql_config.patch
mariadb-5.5.25-mysqld_multi-features.patch
mariadb-10.0.15-mysqld_multi-features.patch
mariadb-5.5.32-upgrade-exit-status.patch
mariadb-5.2.3-cnf.patch
mysql-community-server-5.5.6-safe-process-in-bin.patch
mariadb-10.0.11-group.patch
mariadb-10.0.5-deharcode-libdir.patch
mariadb-10.0.14-upgrade-datadir.patch
mariadb-10.0.15-upgrade-datadir.patch
mysql-community-server-5.6.12-srv_buf_size.patch
mariadb-10.0.9-perl-in-bench.patch
mariadb-10.0.11-header_files_const_warnings.patch
mariadb-10.0.13-default-source.patch
mariadb-10.0.15-default-source.patch
mariadb-10.0.15-fortify-and-O.patch