bzr commit into mysql-5.5-telco-7.0 branch (magnus.blaudd:3192)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/5.5-telco-7.0/ based on revid:magnus.blaudd@strippedp7yjc

 3192 Magnus Blåudd	2011-02-08 [merge]
      Merge 7.0 -> 5.5-telco-7.0

    modified:
      sql/ha_ndbcluster.cc
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-02-08 09:53:29 +0000
+++ b/sql/ha_ndbcluster.cc	2011-02-08 09:57:07 +0000
@@ -7259,8 +7259,8 @@ struct NDB_Modifier
 static const
 struct NDB_Modifier ndb_table_modifiers[] =
 {
-  { NDB_Modifier::M_BOOL, STRING_WITH_LEN("NOLOGGING"), 0, 0 },
-  { NDB_Modifier::M_BOOL, 0, 0, 0, 0 }
+  { NDB_Modifier::M_BOOL, STRING_WITH_LEN("NOLOGGING"), 0, {0} },
+  { NDB_Modifier::M_BOOL, 0, 0, 0, {0} }
 };
 
 /**

No bundle (reason: revision is a merge).