1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Manual merge from 4.1 (bug#15145).

This commit is contained in:
unknown
2005-11-22 20:30:45 +01:00

View File

@@ -512,7 +512,6 @@ then
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
@@ -524,6 +523,7 @@ then
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
@@ -706,6 +706,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