bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4038 to 4040)

[magnus.blaudd]

 4040 magnus.blaudd@stripped	2012-10-17 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/common/portlib/NdbThread.c
 4039 magnus.blaudd@stripped	2012-10-17
      Add check which detects if WITH_NDB_JAVA_DEFAULT should be magically set to OFF

    modified:
      storage/ndb/CMakeLists.txt
 4038 magnus.blaudd@stripped	2012-10-17 [merge]
      Merge 7.1 -> 7.2

    modified:
      storage/ndb/src/common/portlib/NdbThread.c
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2012-10-16 07:51:23 +0000
+++ b/storage/ndb/CMakeLists.txt	2012-10-17 16:16:17 +0000
@@ -201,6 +201,18 @@ SET(WITH_NDB_JAVA_DEFAULT ON)
 IF (DEFINED ENV{WITH_NDB_JAVA_DEFAULT})
   SET(WITH_NDB_JAVA_DEFAULT $ENV{WITH_NDB_JAVA_DEFAULT})
   MESSAGE(STATUS "Default value for WITH_NDB_JAVA set to ${WITH_NDB_JAVA_DEFAULT}")
+ELSE()
+  # Check if the default for WITH_NDB_JAVA should be
+  # magically overriden
+  SET(magic_value "MySQL")
+  IF(DEFINED ENV{PRODUCT_ID})
+    SET(magic_value $ENV{PRODUCT_ID})
+  ENDIF()
+  IF (magic_value STREQUAL "bootstrap-cmake-tar-gz")
+    SET(WITH_NDB_JAVA_DEFAULT OFF)
+    MESSAGE(STATUS "Default value for WITH_NDB_JAVA set to 0 since "
+                   "bootstrapping was detected")
+  ENDIF()
 ENDIF()
 OPTION(WITH_NDB_JAVA
   "Include NDB Cluster Java components" ${WITH_NDB_JAVA_DEFAULT})

=== modified file 'storage/ndb/src/common/portlib/NdbThread.c'
--- a/storage/ndb/src/common/portlib/NdbThread.c	2012-10-17 13:31:36 +0000
+++ b/storage/ndb/src/common/portlib/NdbThread.c	2012-10-17 16:20:19 +0000
@@ -340,12 +340,12 @@ void NdbThread_Destroy(struct NdbThread*
 {
   DBUG_ENTER("NdbThread_Destroy");
   if (*p_thread != NULL){
-    DBUG_PRINT("enter",("*p_thread: 0x%lx", (long) *p_thread));
 #ifdef _WIN32
     HANDLE thread_handle = (*p_thread)->thread_handle;
     if (thread_handle)
       CloseHandle(thread_handle);
 #endif
+    DBUG_PRINT("enter",("*p_thread: 0x%lx", (long) *p_thread));
     free(* p_thread); 
     * p_thread = 0;
   }

No bundle (reason: useless for push emails).