[Pkg-mysql-commits] r1608 - mysql-dfsg-5.1/branches/experimental/debian

[Christian Hammers]

Author: ch
Date: 2009-07-03 22:53:36 +0000 (Fri, 03 Jul 2009)
New Revision: 1608

Modified:
   mysql-dfsg-5.1/branches/experimental/debian/changelog
   mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.preinst
Log:
  * Preinst now prevents Installation if NDB configuration is detected.



Modified: mysql-dfsg-5.1/branches/experimental/debian/changelog
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-07-03 22:39:14 UTC (rev 1607)
+++ mysql-dfsg-5.1/branches/experimental/debian/changelog	2009-07-03 22:53:36 UTC (rev 1608)
@@ -4,6 +4,7 @@
   * New upstream release. 
   * Fixed mysql-test suite by adding 50_mysql-test__db_test.dpatch.
     It now passes 100% of the tests again.
+  * Preinst now prevents Installation if NDB configuration is detected.
 
  -- Christian Hammers <ch at debian.org>  Wed, 01 Jul 2009 20:54:58 +0200
 

Modified: mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.preinst
===================================================================
--- mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.preinst	2009-07-03 22:39:14 UTC (rev 1607)
+++ mysql-dfsg-5.1/branches/experimental/debian/mysql-server-5.1.preinst	2009-07-03 22:53:36 UTC (rev 1608)
@@ -64,6 +64,13 @@
   exit 1
 fi
 
+# Abort if an NDB cluster is in use.
+if egrep -q -r '^[^#]*ndb.connectstring' /etc/mysql/; then
+  /bin/echo -e "\nPROBLEM: MySQL-5.1 has orphaned NDB Cluster support.\n";
+  /bin/echo -e "Please remove all lines starting with ndb from my.cnf.\n";
+  exit 1
+fi
+
 # Safe the user from stupidities.
 show_downgrade_warning=0
 for i in `ls $DATADIR/debian-*.flag 2>/dev/null`; do