bzr push into mysql-5.5-cluster branch (magnus.blaudd:3568 to 3569)

[magnus.blaudd]

 3569 magnus.blaudd@stripped	2011-10-05 [merge]
      Merge

    modified:
      sql/ha_ndbcluster_glue.h
 3568 jonas oreland	2011-10-04
      ndb - handle empty $ENV{CLASSPATH} also on windows

    modified:
      storage/ndb/ndb_configure.cmake
=== modified file 'sql/ha_ndbcluster_glue.h'
--- a/sql/ha_ndbcluster_glue.h	2011-09-23 12:40:40 +0000
+++ b/sql/ha_ndbcluster_glue.h	2011-10-05 07:16:59 +0000
@@ -77,12 +77,6 @@ bool close_cached_tables(THD *thd, TABLE
 
 #endif
 
-#if MYSQL_VERSION_ID >= 50600
-
-/* No support for --server-id-bits and thd->unmasked_server_id, yet */
-#define NDB_WITHOUT_SERVER_ID_BITS
-
-#endif
 
 extern ulong opt_server_id_mask;
 

No bundle (reason: useless for push emails).