bzr push into mysql-5.5-cluster branch (jonas.oreland:3439 to 3440)

[Jonas Oreland]

 3440 Jonas Oreland	2011-08-26
      ndb - remove usage of cmake -E rename which is a 2.8 feature

    modified:
      storage/ndb/config/type_JAVA.cmake
 3439 Jonas Oreland	2011-08-25
      ndb 55 - randomly update scan_count...needs to be fixed in 70

    modified:
      mysql-test/suite/ndb/r/ndb_join_pushdown.result
=== modified file 'storage/ndb/config/type_JAVA.cmake'
--- a/storage/ndb/config/type_JAVA.cmake	2011-07-17 16:24:18 +0000
+++ b/storage/ndb/config/type_JAVA.cmake	2011-08-26 12:48:45 +0000
@@ -184,7 +184,8 @@ MACRO(CREATE_JAR)
     OUTPUT ${JAR}
     COMMAND echo \"${JAVA_ARCHIVE} ${_ARG} ${JAR}.tmp ${ARG_MANIFEST} -C ${CLASS_DIR} .\"
     COMMAND ${JAVA_ARCHIVE} ${_ARG} ${JAR}.tmp ${ARG_MANIFEST} -C ${CLASS_DIR} .
-    COMMAND ${CMAKE_COMMAND} -E rename ${JAR}.tmp ${JAR}
+    COMMAND ${CMAKE_COMMAND} -E copy ${JAR}.tmp ${JAR}
+    COMMAND ${CMAKE_COMMAND} -E remove ${JAR}.tmp
     COMMENT "Creating ${TARGET}.jar"
     DEPENDS ${MARKER}
   )

No bundle (reason: useless for push emails).