Merge remote-tracking branch 'origin/3.4' into develop

This commit is contained in:
Laurent Destailleur 2013-10-29 23:55:20 +01:00
commit 8045f6091f
2 changed files with 9 additions and 1 deletions

View File

@ -464,7 +464,11 @@ echo Restart mysql server
/sbin/service mysqld restart
%else
%if 0%{?suse_version}
if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart
else
/sbin/service mysql restart
fi
%else
if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart

View File

@ -288,7 +288,11 @@ fi
# Restart mysql
echo Restart mysql
/sbin/service mysql restart
if [ -f /etc/init.d/mysqld ]; then
/etc/init.d/mysqld restart
else
/sbin/service mysql restart
fi
# Show result
echo