forked from pool/mariadb
- Updated to the version 10.0.17
* Release notes:
http://kb.askmonty.org/v/mariadb-10017-release-notes
* Changelog:
http://kb.askmonty.org/v/mariadb-10017-changelog
- merged patches to packaging git and regenerated
* few fixes mainly to upgrades
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=166
This commit is contained in:
Michal Hrusecky (old before rename to _miska_)
Git OBS Bridge
parent
5bd6f1bd84
commit
b6653d8e22
@ -29,6 +29,7 @@ export CXXFLAGS="$CFLAGS -felide-constructors"
|
||||
%endif
|
||||
-DWITH_XTRADB_STORAGE_ENGINE=1 \
|
||||
-DWITH_CSV_STORAGE_ENGINE=1 \
|
||||
-DWITH_HANDLERSOCKET_STORAGE_ENGINE=1 \
|
||||
-DWITH_EMBEDDED_SERVER=true \
|
||||
-DCOMPILATION_COMMENT="openSUSE package" \
|
||||
-DDENABLE_DOWNLOADS=false \
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e4312d7a8132189453340e519c8aee70791e450933d8f47bf734f9db0f83a5c5
|
||||
oid sha256:55f9dc7300fa294189c5e74d950bdbcefd48bdc916a8f4521a86d1e284fc451b
|
||||
size 221
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8
|
||||
size 55531927
|
||||
3
mariadb-10.0.17.tar.gz
Normal file
3
mariadb-10.0.17.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9cd394e99942c3700b13f2bf126895fe587e668bfcaffcfd81f0cd878fc19311
|
||||
size 55989700
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 3 05:48:08 UTC 2015 - michal.hrusecky@opensuse.org
|
||||
|
||||
- Updated to the version 10.0.17
|
||||
* Release notes:
|
||||
http://kb.askmonty.org/v/mariadb-10017-release-notes
|
||||
* Changelog:
|
||||
http://kb.askmonty.org/v/mariadb-10017-changelog
|
||||
- merged patches to packaging git and regenerated
|
||||
* few fixes mainly to upgrades
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 2 17:25:47 UTC 2015 - mgorse@suse.com
|
||||
|
||||
|
||||
72
mariadb.spec
72
mariadb.spec
@ -21,7 +21,7 @@
|
||||
%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
|
||||
%define srv_vers 5.6.26
|
||||
%if ! %{defined _rundir}
|
||||
%define _rundir %{_localstatedir}/run
|
||||
%endif
|
||||
@ -31,7 +31,7 @@
|
||||
%bcond_with cassandra
|
||||
|
||||
Name: mariadb
|
||||
Version: 10.0.15
|
||||
Version: 10.0.17
|
||||
Release: 0
|
||||
Summary: Server part of MariaDB
|
||||
License: SUSE-GPL-2.0-with-FLOSS-exception
|
||||
@ -79,6 +79,7 @@ BuildRequires: lzo-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: procps
|
||||
BuildRequires: pwdutils
|
||||
BuildRequires: readline-devel
|
||||
@ -360,42 +361,67 @@ done
|
||||
%preun
|
||||
[ $1 = 1 ] || %{_sbindir}/rcmysql stop || true
|
||||
|
||||
%pretrans -p <lua>
|
||||
if posix.access("%{_sbindir}/rcmysql", "x") then
|
||||
restart = os.execute("%{_sbindir}/rcmysql status > /dev/null")
|
||||
if restart == 0 then
|
||||
os.execute("%{_sbindir}/rcmysql stop")
|
||||
os.execute("/bin/mkdir -p %{_rundir}/mysql/restart")
|
||||
end
|
||||
end
|
||||
|
||||
%posttrans
|
||||
%if 0%{have_info} > 0
|
||||
[ -z "`ls %{_infodir}/mysql.info.* 2> /dev/null`" ] || \
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/mysql.info.*
|
||||
%endif
|
||||
if [ -d %{_localstatedir}/lib/mysql ]; then
|
||||
touch %{_localstatedir}/lib/mysql/.run-mysql_upgrade
|
||||
fi
|
||||
rm -f %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}
|
||||
for in in protected tmp; do
|
||||
rmdir %{_localstatedir}/lib/mysql/.$i 2>/dev/null || :
|
||||
done
|
||||
# start mysql again if it should run
|
||||
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 || :
|
||||
# During package rename, there might be config file move
|
||||
if [ -f /etc/my.cnf.rpmsave ]; then
|
||||
mv /etc/my.cnf{,.rpmnew}
|
||||
mv /etc/my.cnf{.rpmsave,}
|
||||
cat >> %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} << EOF
|
||||
|
||||
WARNING: /etc/my.cnf.rpmsave file detected!
|
||||
|
||||
This probably means that you are upgrading from different variant of MySQL.
|
||||
Your original configuration file was restored. If it is not a case, you can
|
||||
find your original /etc/my.cnf as /etc/my.cnf.rpmnew
|
||||
|
||||
EOF
|
||||
|
||||
fi
|
||||
# warn on first run
|
||||
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 > %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} << EOF
|
||||
[ -n "$datadir" ] || datadir="%{_localstatedir}/lib/mysql"
|
||||
if [ -d "$datadir/mysql" ]; then
|
||||
touch "$datadir/.run-mysql_upgrade"
|
||||
fi
|
||||
for in in protected tmp; do
|
||||
rmdir "$datadir"/.$i 2>/dev/null || :
|
||||
done
|
||||
if [ \! -f "$datadir/mysql_upgrade_info" ]; then
|
||||
cat >> %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} << EOF
|
||||
|
||||
%(cat %{_sourcedir}/README.install)
|
||||
|
||||
EOF
|
||||
else
|
||||
MYSQLVER="`echo %{version} | sed 's|\.[0-9]\+$||'`"
|
||||
if [ -f "$datadir/mysql_upgrade_info" ] && \
|
||||
[ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then
|
||||
cat >> %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release} << EOF
|
||||
|
||||
WARNING: You are upgrading from different stable version of MySQL!
|
||||
|
||||
Your database will be migrated automatically during next restart of MySQL.
|
||||
Before you do that make sure you have up to date backup of your data. It
|
||||
should be mainly in $datadir directory.
|
||||
|
||||
EOF
|
||||
fi
|
||||
fi
|
||||
# start mysql again if it should run - migration from old setup
|
||||
if [ -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
|
||||
|
||||
#######################################################################
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ac425e8094f738ad9594c2b76b49bfbdd492c923bce3e50755f3189a80eaa72e
|
||||
size 25131
|
||||
oid sha256:89209fffcb7d65e02821e9a7e2d53e9670d3dbecbc242044142ca49de2ad54f1
|
||||
size 14752
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 1995-2015 SUSE Linux AG Nuernberg, Germany.
|
||||
# Copyright (c) 1995-2014 SuSE Linux AG Nuernberg, Germany.
|
||||
#
|
||||
# Author: Lenz Grimmer
|
||||
# Maintainer: Michal Hrusecky <mhrusecky@suse.cz>
|
||||
@ -32,6 +32,10 @@
|
||||
# rc_reset clear local rc status (overall remains)
|
||||
# rc_exit exit appropriate to overall rc status
|
||||
|
||||
_rc_status_ret=0
|
||||
_rc_status=$_rc_status_ret
|
||||
_rc_status_all=$_rc_status
|
||||
|
||||
rc_check ()
|
||||
{
|
||||
_rc_status_ret=$?
|
||||
@ -86,9 +90,6 @@ rc_reset ()
|
||||
return 0
|
||||
}
|
||||
|
||||
# First reset status of this service
|
||||
rc_reset
|
||||
|
||||
# Return values acc. to LSB for all commands but status:
|
||||
# 0 - success
|
||||
# 1 - generic or unspecified error
|
||||
@ -425,22 +426,7 @@ else
|
||||
# Run mysql_upgrade on every package install/upgrade. Not always
|
||||
# necessary, but doesn't do any harm. On big upgrade, require
|
||||
# user confirmation.
|
||||
if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then
|
||||
if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \
|
||||
[ -f "$datadir/mysql_upgrade_info" ] && \
|
||||
[ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then
|
||||
echo
|
||||
echo "You are upgrading from different stable version of MySQL!"
|
||||
echo "Make sure you to make backup of your data (mostly $datadir)!"
|
||||
echo
|
||||
echo "If you want to continue upgrading your database, run following commands:"
|
||||
echo
|
||||
echo " touch /var/lib/mysql/.force_upgrade"
|
||||
echo " rcmysql restart"
|
||||
echo
|
||||
rc_failed; rc_status -v; rc_exit
|
||||
|
||||
fi
|
||||
if [ -f "$datadir/.run-mysql_upgrade" ]; then
|
||||
echo > "$log_upgrade"
|
||||
echo "`LANG="" date` - upgrading MySQL..." >> "$log_upgrade"
|
||||
echo >> "$log_upgrade"
|
||||
@ -566,6 +552,8 @@ else
|
||||
rm -f /var/lib/mysql/.run-mysql_upgrade
|
||||
rm -f /var/lib/mysql/.force_upgrade
|
||||
rm -f "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past
|
||||
MYSQLVERSION="`mysqld --version 2> /dev/null | sed -n 's|mysqld[[:blank:]]\+Ver[[:blank:]]\+\([^[:blank:]]\+\)[[:blank:]].*|\1|p'`"
|
||||
[ -z "$MYSQLVERSION" ] || echo "$MYSQLVERSION" > "$datadir"/mysql_upgrade_info
|
||||
chown --no-dereference "$mysql_daemon_user:$mysql_daemon_group" "$log_upgrade"
|
||||
chmod 640 "$log_upgrade"
|
||||
fi
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
# Copyright (c) 1995-2015 SUSE Linux AG Nuernberg, Germany.
|
||||
# Copyright (c) 1995-2014 SuSE Linux AG Nuernberg, Germany.
|
||||
#
|
||||
# Author: Lenz Grimmer
|
||||
# Maintainer: Michal Hrusecky <mhrusecky@suse.cz>
|
||||
@ -372,22 +372,7 @@ else
|
||||
# Run mysql_upgrade on every package install/upgrade. Not always
|
||||
# necessary, but doesn't do any harm. On big upgrade, require
|
||||
# user confirmation.
|
||||
if [ -f "/var/lib/mysql/.run-mysql_upgrade" ]; then
|
||||
if [ \! -f "/var/lib/mysql/.force_upgrade" ] && \
|
||||
[ -f "$datadir/mysql_upgrade_info" ] && \
|
||||
[ -z "`grep "^$MYSQLVER" "$datadir/mysql_upgrade_info" 2> /dev/null`" ]; then
|
||||
echo
|
||||
echo "You are upgrading from different stable version of MySQL!"
|
||||
echo "Make sure you to make backup of your data (mostly $datadir)!"
|
||||
echo
|
||||
echo "If you want to continue upgrading your database, run following commands:"
|
||||
echo
|
||||
echo " touch /var/lib/mysql/.force_upgrade"
|
||||
echo " rcmysql restart"
|
||||
echo
|
||||
rc_failed; rc_status -v; rc_exit
|
||||
|
||||
fi
|
||||
if [ -f "$datadir/.run-mysql_upgrade" ]; then
|
||||
echo > "$log_upgrade"
|
||||
echo "`LANG="" date` - upgrading MySQL..." >> "$log_upgrade"
|
||||
echo >> "$log_upgrade"
|
||||
@ -513,6 +498,8 @@ else
|
||||
rm -f /var/lib/mysql/.run-mysql_upgrade
|
||||
rm -f /var/lib/mysql/.force_upgrade
|
||||
rm -f "$datadir"/{update-stamp-*,mysql/stamp-4.1} # used in the past
|
||||
MYSQLVERSION="`mysqld --version 2> /dev/null | sed -n 's|mysqld[[:blank:]]\+Ver[[:blank:]]\+\([^[:blank:]]\+\)[[:blank:]].*|\1|p'`"
|
||||
[ -z "$MYSQLVERSION" ] || echo "$MYSQLVERSION" > "$datadir"/mysql_upgrade_info
|
||||
chown --no-dereference "$mysql_daemon_user:$mysql_daemon_group" "$log_upgrade"
|
||||
chmod 640 "$log_upgrade"
|
||||
fi
|
||||
|
||||
5
series
5
series
@ -8,10 +8,9 @@ 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.17-group.patch
|
||||
mariadb-10.0.5-deharcode-libdir.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.16-header_files_const_warnings.patch
|
||||
mariadb-10.0.15-fortify-and-O.patch
|
||||
|
||||
Loading…
Reference in New Issue
Block a user