rpm/mariadb
SHA256
1
0
Fork 0
forked from pool/mariadb
Code Pull Requests Activity

- Updated to the version 10.0.17

Browse Source 
* 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_)
2015-03-03 08:15:49 +00:00
committed by Git OBS Bridge
parent 5bd6f1bd84
commit b6653d8e22
10 changed files with 81 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rc.mysql.sysvinit
View File

@@ -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