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

[Magnus Blåudd]

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

 3114 Magnus Blåudd	2010-11-10 [merge]
      Merge 7.0 -> 5.5-telco-7.0

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbinfo.cc
      storage/ndb/src/kernel/CMakeLists.txt
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-11-10 14:02:30 +0000
+++ b/sql/ha_ndbcluster.cc	2010-11-10 14:49:47 +0000
@@ -62,7 +62,7 @@ static const ulong ONE_YEAR_IN_SECONDS= 
 
 ulong opt_ndb_extra_logging;
 static ulong opt_ndb_wait_connected;
-extern ulong opt_ndb_wait_setup;
+ulong opt_ndb_wait_setup;
 static ulong opt_ndb_cache_check_time;
 static uint opt_ndb_cluster_connection_pool;
 static char* opt_ndb_connectstring;
@@ -10100,7 +10100,7 @@ static int ndb_wait_setup_func_impl(ulon
   DBUG_RETURN((ndb_setup_complete == 1)? 0 : 1);
 }
 
-extern int(*ndb_wait_setup_func)(ulong);
+int(*ndb_wait_setup_func)(ulong) = 0;
 #endif
 extern int ndb_dictionary_is_mysqld;
 

=== modified file 'sql/ha_ndbinfo.cc'
--- a/sql/ha_ndbinfo.cc	2010-04-15 12:55:31 +0000
+++ b/sql/ha_ndbinfo.cc	2010-11-10 14:17:13 +0000
@@ -16,7 +16,8 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 
-#include "mysql_priv.h"
+#include "ha_ndbcluster_glue.h"
+
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
 #include "ha_ndbinfo.h"
 #include "../storage/ndb/src/ndbapi/NdbInfo.hpp"

=== modified file 'storage/ndb/src/kernel/CMakeLists.txt'
--- a/storage/ndb/src/kernel/CMakeLists.txt	2010-11-05 08:39:22 +0000
+++ b/storage/ndb/src/kernel/CMakeLists.txt	2010-11-10 14:45:18 +0000
@@ -54,12 +54,12 @@ ENDIF()
 
 ADD_EXECUTABLE(ndbd
   main.cpp ndbd.cpp angel.cpp SimBlockList.cpp ${NDBD_EXTRA_SRC})
-TARGET_LINK_LIBRARIES(ndbd ${NDBD_LIBS} ndbsched)
+TARGET_LINK_LIBRARIES(ndbd ${NDBD_LIBS} ndbsched ${LIBDL})
 INSTALL(TARGETS ndbd DESTINATION libexec)
 
 IF(NDB_BUILD_NDBMTD)
   ADD_EXECUTABLE(ndbmtd
     main.cpp ndbd.cpp angel.cpp SimBlockList.cpp ${NDBD_EXTRA_SRC})
-  TARGET_LINK_LIBRARIES(ndbmtd ${NDBD_LIBS} ndbsched_mt)
+  TARGET_LINK_LIBRARIES(ndbmtd ${NDBD_LIBS} ndbsched_mt ${LIBDL})
   INSTALL(TARGETS ndbmtd DESTINATION libexec)
 ENDIF()

No bundle (reason: revision is a merge).