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

[Magnus Blåudd]

#At file:///home/msvensson/mysql/tmp/iW4GwTWD_P/5.5-telco-7.0/ based on revid:magnus.blaudd@stripped-5tfayrdjorjb18wa

 3122 Magnus Blåudd	2010-11-17 [merge]
      Merge 7.0 -> 5.5-telco-7.0

    modified:
      sql/ha_ndbcluster_glue.h
=== modified file 'sql/ha_ndbcluster_glue.h'
--- a/sql/ha_ndbcluster_glue.h	2010-11-15 09:15:27 +0000
+++ b/sql/ha_ndbcluster_glue.h	2010-11-17 08:10:15 +0000
@@ -106,6 +106,13 @@ enum column_format_type {
 /* No support for --ndb-wait_setup */
 #define NDB_NO_WAIT_SETUP
 
+/*
+  The enum open_table_mode has been removed in 5.5.7 and 'open_table_from_share'
+  now takes "bool is_create_table" instead of the enum type. Define OTM_OPEN
+  to false since it's not a create table
+*/
+#define OTM_OPEN false
+
 #endif
 
 /* extract the bitmask of options from THD */
@@ -209,13 +216,6 @@ int mysql_cond_timedwait(mysql_cond_t* c
   return pthread_cond_timedwait(cond, mutex, abstime);
 }
 
-/*  mysql_truncate_table emulation, added in 5.5 */
-static inline
-bool mysql_truncate_table(THD *thd, TABLE_LIST *table_ref)
-{
-  return mysql_truncate(thd, table_ref, 0);
-}
-
 #endif
 
 static inline
@@ -273,4 +273,17 @@ uint partition_info_num_subparts(const p
 #endif
 }
 
+/*  mysql_truncate_table emulation */
+static inline
+bool mysql_truncate_table(THD *thd, TABLE_LIST *table_ref)
+{
+#if MYSQL_VERSION_ID < 50500
+  return mysql_truncate(thd, table_ref, 0);
+#else
+  /* mysql_truncate support removed in 5.5.7 */
+  abort();
+  return false;
+#endif
+}
+
 #endif

No bundle (reason: revision is a merge).