From: Valentin Vidic <Valentin.Vidic@CARNet.hr>
Date: Tue, 31 Jan 2012 11:38:06 +0000 (+0100)
Subject: Fix mysql upgrade.
X-Git-Tag: debian/6.0.1~10
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=carnet-upgrade.git;a=commitdiff_plain;h=cce8f05540161810b020c725285c904196f889ae

Fix mysql upgrade.
---

diff --git a/src/actions/main.queue b/src/actions/main.queue
index 39cab95..285ba62 100644
--- a/src/actions/main.queue
+++ b/src/actions/main.queue
@@ -34,7 +34,7 @@ pkg amavisd-new			upgrade_amavis
 pkg apache2-cn			upgrade_apache2
 pkg postfix-cn			upgrade_postfix
 pkg bind9-cn			upgrade_bind
-true				upgrade_mysql
+pkg mysql-cn			upgrade_mysql
 true				upgrade_postgresql
 true				upgrade first		# neki paketi moraju rucno
 true				upgrade second		# neke pakete zelimo ranije
diff --git a/src/functions.sh b/src/functions.sh
index 1d05d1c..c6dbd85 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -907,8 +907,8 @@ upgrade_openldap () {
 upgrade_mysql () {
   if pkg mysql-server || pkg mysql-server-5.0; then
      pkgadd mysql-server
-     pkgrm mysql-server-5.0
-     /etc/init.d/mysql start
+     dpkg -P mysql-server-5.0
+     /etc/init.d/mysql restart
   fi
 }