[Pkg-mysql-commits] r1739 - mysql-dfsg-5.1/branches/unstable/debian

[Norbert Tretkowski]

tags 545760 pending
thanks

Author: nobse
Date: 2009-09-13 13:07:52 +0000 (Sun, 13 Sep 2009)
New Revision: 1739

Modified:
   mysql-dfsg-5.1/branches/unstable/debian/changelog
   mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.preinst
Log:
Do not upgrade if there is an ndb management node configured.

Modified: mysql-dfsg-5.1/branches/unstable/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-09-13 12:48:48 UTC (rev 1738)
+++ mysql-dfsg-5.1/branches/unstable/debian/changelog	2009-09-13 13:07:52 UTC (rev 1739)
@@ -10,8 +10,10 @@
   * Drop --without-ndbcluster from configure call.
   * Fix some options in my.cnf about log_file have their named changed, patch
     from Mathias Gug. (closes: #545761)
+  * Do not upgrade if there is an ndb management node configured, patch from
+    Mathias Gug. (closes: #545760)
 
- -- Norbert Tretkowski <nobse at debian.org>  Sun, 13 Sep 2009 14:47:00 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Sun, 13 Sep 2009 14:48:59 +0200
 
 mysql-dfsg-5.1 (5.1.37-2) unstable; urgency=low
 

Modified: mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.preinst
===================================================================
--- mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.preinst	2009-09-13 12:48:48 UTC (rev 1738)
+++ mysql-dfsg-5.1/branches/unstable/debian/mysql-server-5.1.preinst	2009-09-13 13:07:52 UTC (rev 1739)
@@ -49,7 +49,7 @@
 this_version=5.1
 
 # Abort if an NDB cluster is in use.
-if egrep -q -r '^[^#]*ndb.connectstring' /etc/mysql/; then
+if egrep -qi -r '^[^#]*ndb.connectstring|^[:space:]*\[[:space:]*ndb_mgmd' /etc/mysql/; then
   db_fset mysql-server/no_upgrade_when_using_ndb seen false || true
   db_input high mysql-server/no_upgrade_when_using_ndb || true
   db_go