X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=blobdiff_plain;f=src%2Ffunctions.sh;h=61ca1dba750169d11f065b5b97ca889dcc03cdf4;hp=4a5de69a1fe34b3463ebf958c08b0102eb4e8814;hb=f2d11c457a9abef466327c9df2ca378da941c6dc;hpb=7765ebc71474697a0d8cfe68a8b1897aa2fd63c5

diff --git a/src/functions.sh b/src/functions.sh
index 4a5de69..61ca1db 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -908,12 +908,14 @@ upgrade_amavis () {
   /etc/init.d/amavis restart
 }
 
-# handle mysql 5.0 to 5.1 upgrade
+# handle mysql upgrade
 upgrade_mysql () {
-  if pkg mysql-server || pkg mysql-server-5.1; then
-     pkgadd mysql-server
-     dpkg -P mysql-server-5.1
-     /etc/init.d/mysql restart
+  if pkg mysql-server || pkg mysql-server-5.5 || \
+     pkg mariadb-server || pkg mariadb-server-10.0
+  then
+     pkgadd default-mysql-server
+     dpkg -P mysql-server mysql-server-5.5 mariadb-server-10.0
+     service mysql restart
   fi
 }