[Pkg-mysql-commits] r1998 - mysql-5.5/branches/experimental/debian

[Norbert Tretkowski]

Author: nobse
Date: 2011-06-23 19:55:31 +0000 (Thu, 23 Jun 2011)
New Revision: 1998

Modified:
   mysql-5.5/branches/experimental/debian/mysql-server-5.5.preinst
Log:
Really merge 5.1.57-2 and 5.1.57-3.

Modified: mysql-5.5/branches/experimental/debian/mysql-server-5.5.preinst
===================================================================
--- mysql-5.5/branches/experimental/debian/mysql-server-5.5.preinst	2011-06-23 19:17:06 UTC (rev 1997)
+++ mysql-5.5/branches/experimental/debian/mysql-server-5.5.preinst	2011-06-23 19:55:31 UTC (rev 1998)
@@ -49,7 +49,7 @@
 this_version=5.5
 
 # Abort if an NDB cluster is in use.
-if egrep -qi -r '^[^#]*ndb.connectstring|^[:space:]*\[[:space:]*ndb_mgmd' /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