[Pkg-mysql-commits] r1028 - branches/sid-5.0/debian

[Norbert Tretkowski]

tags 453127 pending
thanks

Author: nobse
Date: 2007-11-30 13:27:53 +0000 (Fri, 30 Nov 2007)
New Revision: 1028

Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/mysql-common.preinst
Log:
Don't fail when upgrading mysql-common if  is empty or not defined (patch from Edward Allcutt).

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-11-30 11:43:17 UTC (rev 1027)
+++ branches/sid-5.0/debian/changelog	2007-11-30 13:27:53 UTC (rev 1028)
@@ -8,11 +8,13 @@
     (closes: #436552)
   * New patch from Ubuntu to fix a crash in mysql_client_test due to gcc 4.x
     optimizations. (closes: #452558)
+  * Don't fail when upgrading mysql-common if $datadir is empty or not defined
+    (patch from Edward Allcutt). (closes: #453127)
   * New Finnish debconf translation from Esko Arajärvi. (closes: #448776)
   * Run testsuite after build (but skip ndb tests for now).
   * Add Vcs-* and Homepage flags to source stanza in control file.
 
- -- Norbert Tretkowski <nobse at debian.org>  Thu, 29 Nov 2007 18:17:22 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Fri, 30 Nov 2007 14:19:47 +0100
 
 mysql-dfsg-5.0 (5.0.45-3) unstable; urgency=high
 

Modified: branches/sid-5.0/debian/mysql-common.preinst
===================================================================
--- branches/sid-5.0/debian/mysql-common.preinst	2007-11-30 11:43:17 UTC (rev 1027)
+++ branches/sid-5.0/debian/mysql-common.preinst	2007-11-30 13:27:53 UTC (rev 1028)
@@ -150,7 +150,7 @@
 if [ "$1" = "upgrade" ] && [ -x /usr/sbin/mysqld ]; then
 	cvt_datadir=`cvt_get_param datadir`
 	# test for ISAM tables, which we must convert NOW
-	if [ -n "`find $cvt_datadir -name '*.ISM' 2>/dev/null`" ]; then
+	if [ -n "$cvt_datadir" ] && [ -d "$cvt_datadir" ] && [ -n "`find $cvt_datadir -name '*.ISM' 2>/dev/null`" ]; then
 		pidfile=`cvt_get_param pid-file`
 		if [ "$pidfile" ] && [ -f "$pidfile" ]; then
 			server_pid=`cat $pidfile`