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

[magnus.blaudd]

 4135 magnus.blaudd@stripped	2012-12-04 [merge]
      Merge

    modified:
      storage/ndb/CMakeLists.txt
      storage/ndb/cmake/ndb_require_variable.cmake
 4134 Frazer Clement	2012-12-03 [merge]
      Merge 7.1->7.2

    modified:
      mysql-test/suite/ndb_rpl/r/ndb_rpl_conflict_epoch_trans.result
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.cnf
      mysql-test/suite/ndb_rpl/t/ndb_rpl_conflict_epoch_trans.test
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2012-11-28 12:50:14 +0000
+++ b/storage/ndb/CMakeLists.txt	2012-12-03 13:24:40 +0000
@@ -238,28 +238,29 @@ OPTION(WITH_NDB_JAVA
   "Include NDB Cluster Java components" ${WITH_NDB_JAVA_DEFAULT})
 IF(WITH_NDB_JAVA)
   # Check for Java and JDK needed by ndbjtie and clusterj
-  INCLUDE(FindJava)
-  INCLUDE(FindJNI)
-  INCLUDE("${NDB_SOURCE_DIR}/config/type_JAVA.cmake")
-
-  IF(JAVA_COMPILE AND JAVA_ARCHIVE)
-    MESSAGE(STATUS "Found Java")
-    SET(HAVE_JAVA TRUE)
-  ELSE()
-    MESSAGE(FATAL_ERROR "Could not find Java")
-  ENDIF()
+  FIND_PACKAGE(Java 1.6 REQUIRED)
+  MESSAGE(STATUS "Java_VERSION: ${Java_VERSION}")
+  MESSAGE(STATUS "Java_VERSION_STRING: ${Java_VERSION_STRING}")
+  MESSAGE(STATUS "JAVA_RUNTIME: ${JAVA_RUNTIME}")
+  MESSAGE(STATUS "JAVA_COMPILE: ${JAVA_COMPILE}")
+  MESSAGE(STATUS "JAVA_ARCHIVE: ${JAVA_ARCHIVE}")
+  NDB_REQUIRE_VARIABLE(JAVA_RUNTIME)
+  NDB_REQUIRE_VARIABLE(JAVA_COMPILE)
+  NDB_REQUIRE_VARIABLE(JAVA_ARCHIVE)
 
-  IF(JAVA_INCLUDE_PATH AND JAVA_INCLUDE_PATH2)
-    MESSAGE(STATUS "Found JDK")
-    SET(HAVE_JDK TRUE)
-  ELSE()
-    MESSAGE(FATAL_ERROR "Could not find JDK")
-  ENDIF()
+  FIND_PACKAGE(JNI REQUIRED)
+  MESSAGE(STATUS "JNI_FOUND: ${JNI_FOUND}")
+  MESSAGE(STATUS "JNI_INCLUDE_DIRS: ${JNI_INCLUDE_DIRS}")
+  MESSAGE(STATUS "JNI_LIBRARIES: ${JNI_LIBRARIES}")
+  NDB_REQUIRE_VARIABLE(JNI_INCLUDE_DIRS)
 
+  INCLUDE("${NDB_SOURCE_DIR}/config/type_JAVA.cmake")
+  SET(HAVE_JAVA TRUE)
+  SET(HAVE_JDK TRUE)
   SET(WITH_CLASSPATH ${WITH_CLASSPATH} CACHE STRING
     "Enable the classpath for MySQL Cluster Java Connector")
 ELSE(WITH_NDB_JAVA)
-  MESSAGE(STATUS "Excluding Cluster Java components") 
+  MESSAGE(STATUS "Excluding Cluster Java components")
 ENDIF(WITH_NDB_JAVA)
 
 ADD_SUBDIRECTORY(include)

=== modified file 'storage/ndb/cmake/ndb_require_variable.cmake'
--- a/storage/ndb/cmake/ndb_require_variable.cmake	2010-11-10 09:42:49 +0000
+++ b/storage/ndb/cmake/ndb_require_variable.cmake	2012-12-03 13:24:40 +0000
@@ -19,7 +19,7 @@
 # Check that the variable with given name is defined
 #
 MACRO(NDB_REQUIRE_VARIABLE variable_name)
-  MESSAGE(STATUS "Checking variable ${variable_name} required by NDB")
+  #MESSAGE(STATUS "Checking variable ${variable_name} required by NDB")
   IF(NOT DEFINED "${variable_name}")
     MESSAGE(FATAL_ERROR "The variable ${variable_name} is required "
                          "to build NDB")

No bundle (reason: useless for push emails).