bzr push into mysql-5.5-cluster branch (magnus.blaudd:3642 to 3644) WL#5881

[magnus.blaudd]

 3644 magnus.blaudd@stripped	2011-11-14
      WL#5881
       - Add support for building ndbcluster without GSL hook

    modified:
      sql/ndb_global_schema_lock.cc
 3643 magnus.blaudd@stripped	2011-11-14
      WL#5881
       - Fix support to build ndbcluster without COLUMN_FORMAT
         support

    modified:
      sql/ha_ndbcluster.cc
 3642 jonas oreland	2011-11-12 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-11-10 20:35:28 +0000
+++ b/sql/ha_ndbcluster.cc	2011-11-14 12:31:17 +0000
@@ -9307,9 +9307,12 @@ const Uint32 OLD_NDB_MAX_TUPLE_SIZE_IN_W
 static int create_ndb_column(THD *thd,
                              NDBCOL &col,
                              Field *field,
-                             HA_CREATE_INFO *create_info,
-                             column_format_type
-                               default_format= COLUMN_FORMAT_TYPE_DEFAULT)
+                             HA_CREATE_INFO *create_info
+#ifndef NDB_WITHOUT_COLUMN_FORMAT
+                             , column_format_type
+                               default_format= COLUMN_FORMAT_TYPE_DEFAULT
+#endif
+                            )
 {
   NDBCOL::StorageType type= NDBCOL::StorageTypeMemory;
   bool dynamic= FALSE;

=== modified file 'sql/ndb_global_schema_lock.cc'
--- a/sql/ndb_global_schema_lock.cc	2011-09-22 13:41:13 +0000
+++ b/sql/ndb_global_schema_lock.cc	2011-11-14 14:15:33 +0000
@@ -353,6 +353,8 @@ ndbcluster_global_schema_unlock(THD *thd
   DBUG_RETURN(0);
 }
 
+
+#ifndef NDB_WITHOUT_GLOBAL_SCHEMA_LOCK
 static
 int
 ndbcluster_global_schema_func(THD *thd, bool lock, void* args)
@@ -362,9 +364,11 @@ ndbcluster_global_schema_func(THD *thd, 
     bool no_lock_queue = (bool)args;
     return ndbcluster_global_schema_lock(thd, no_lock_queue, true);
   }
- 
+
   return ndbcluster_global_schema_unlock(thd);
 }
+#endif
+
 
 #include "ndb_global_schema_lock.h"
 
@@ -376,7 +380,9 @@ void ndbcluster_global_schema_lock_init(
   gsl_initialized= true;
   pthread_mutex_init(&gsl_mutex, MY_MUTEX_INIT_FAST);
 
+#ifndef NDB_WITHOUT_GLOBAL_SCHEMA_LOCK
   hton->global_schema_func= ndbcluster_global_schema_func;
+#endif
 }
 
 
@@ -393,6 +399,11 @@ void ndbcluster_global_schema_lock_deini
 bool
 Thd_ndb::has_required_global_schema_lock(const char* func)
 {
+#ifdef NDB_WITHOUT_GLOBAL_SCHEMA_LOCK
+  // The global schema lock hook is not installed ->
+  //  no thd has gsl
+  return true;
+#else
   if (global_schema_lock_error)
   {
     // An error occured while locking, either because
@@ -415,6 +426,7 @@ Thd_ndb::has_required_global_schema_lock
                   (int)query->length, query->str, func);
   abort();
   return false;
+#endif
 }
 
 

No bundle (reason: useless for push emails).