1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Manual merge from 4.1, bug#15145.

Browse Source
This commit is contained in:
joerg@mysql.com 2005-11-22 20:15:54 +01:00
commit 511fbac4df
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
support-files/mysql.spec.sh
View File

@ -508,22 +508,22 @@ echo "Restarting mysqld."
%preun server %preun server
if test $1 = 0 if test $1 = 0
then then
# Stop MySQL before uninstalling it # Stop MySQL before uninstalling it
if test -x %{_sysconfdir}/init.d/mysql if test -x %{_sysconfdir}/init.d/mysql
then then
%{_sysconfdir}/init.d/mysql stop > /dev/null %{_sysconfdir}/init.d/mysql stop > /dev/null
fi
# Remove autostart of mysql # Remove autostart of mysql
# for older SuSE Linux versions # for older SuSE Linux versions
if test -x /sbin/insserv if test -x /sbin/insserv
then then
/sbin/insserv -r %{_sysconfdir}/init.d/mysql /sbin/insserv -r %{_sysconfdir}/init.d/mysql
# use chkconfig on Red Hat and newer SuSE releases # use chkconfig on Red Hat and newer SuSE releases
elif test -x /sbin/chkconfig elif test -x /sbin/chkconfig
then then
/sbin/chkconfig --del mysql /sbin/chkconfig --del mysql
fi fi
fi
fi fi
# We do not remove the mysql user since it may still own a lot of # We do not remove the mysql user since it may still own a lot of
@ -707,6 +707,11 @@ fi
# itself - note that they must be ordered by date (important when # itself - note that they must be ordered by date (important when
# merging BK trees) # merging BK trees)
%changelog %changelog
* Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com>
- Extend the file existence check for "init.d/mysql" on un-install
to also guard the call to "insserv"/"chkconfig".
* Thu Oct 27 2005 Lenz Grimmer <lenz@grimmer.com> * Thu Oct 27 2005 Lenz Grimmer <lenz@grimmer.com>
- added more man pages - added more man pages