bzr push into mysql-trunk-cluster branch (magnus.blaudd:3362 to 3363)

[magnus.blaudd]

 3363 magnus.blaudd@stripped	2011-09-22 [merge]
      Merge trunk-cluster -> trunk-cluster-merge

    modified:
      storage/ndb/CMakeLists.txt
 3362 magnus.blaudd@stripped	2011-09-22 [merge]
      Merge

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.h
      sql/handler.cc
      sql/handler.h
      sql/lock.h
      sql/ndb_global_schema_lock.cc
      sql/ndb_global_schema_lock.h
      sql/sql_db.cc
      sql/sql_parse.cc
      sql/sql_rename.cc
      sql/sql_table.cc
      sql/sql_truncate.cc
      storage/ndb/CMakeLists.txt
      storage/ndb/src/common/logger/FileLogHandler.cpp
      storage/ndb/src/common/util/File.cpp
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2011-09-22 14:00:22 +0000
+++ b/storage/ndb/CMakeLists.txt	2011-09-22 21:25:49 +0000
@@ -97,7 +97,7 @@ IF (NOT MCP_BUG58158)
   IF(WITH_EMBEDDED_SERVER)
     # Kludge libndbclient into variable used when creating libmysqld
     SET (MYSQLD_STATIC_PLUGIN_LIBS ${MYSQLD_STATIC_PLUGIN_LIBS}
-      ndbclient_static CACHE INTERNAL "" FORCE)
+      ndbclient CACHE INTERNAL "" FORCE)
   ENDIF()
 ENDIF()
 

No bundle (reason: useless for push emails).