bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4243 to 4244)

[Magnus Blåudd]

 4244 Magnus Blåudd	2011-06-16
      ndb
       - fix problem with compiling 7.1 on machine without Java

    modified:
      storage/ndb/CMakeLists.txt
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/src/CMakeLists.txt
 4243 magnus.blaudd@stripped	2011-06-15 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
      storage/ndb/src/ndbapi/ndberror.c
=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2011-05-23 14:15:59 +0000
+++ b/storage/ndb/CMakeLists.txt	2011-06-16 09:33:27 +0000
@@ -159,7 +159,9 @@ ELSE()
   IF(WITH_NDB_TEST)
     ADD_SUBDIRECTORY(src/cw/cpcd)
   ENDIF()
-  ADD_SUBDIRECTORY(clusterj)
+  IF (HAVE_JDK)
+    ADD_SUBDIRECTORY(clusterj)
+  ENDIF()
 
 ENDIF()
 

=== modified file 'storage/ndb/clusterj/CMakeLists.txt'
--- a/storage/ndb/clusterj/CMakeLists.txt	2011-04-06 16:02:16 +0000
+++ b/storage/ndb/clusterj/CMakeLists.txt	2011-06-16 09:33:27 +0000
@@ -13,10 +13,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-IF(!HAVE_JDK)
-  RETURN()
-ENDIF()
-
 MESSAGE(STATUS "including ClusterJ")
 
 IF("${WITH_CLASSPATH}" MATCHES "junit-(.+).jar")

=== modified file 'storage/ndb/src/CMakeLists.txt'
--- a/storage/ndb/src/CMakeLists.txt	2011-02-02 09:20:32 +0000
+++ b/storage/ndb/src/CMakeLists.txt	2011-06-16 09:33:27 +0000
@@ -21,7 +21,6 @@ ADD_SUBDIRECTORY(ndbapi)
 ADD_SUBDIRECTORY(kernel)
 ADD_SUBDIRECTORY(mgmclient)
 ADD_SUBDIRECTORY(mgmsrv)
-ADD_SUBDIRECTORY(ndbjtie)
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include
                     ${CMAKE_SOURCE_DIR}/include)
@@ -41,6 +40,8 @@ SET(NDBCLIENT_LIBS
 
 IF(HAVE_JDK AND HAVE_JAVA)
 
+  ADD_SUBDIRECTORY(ndbjtie)
+
   SET(NDBCLIENT_LIBS ${NDBCLIENT_LIBS} mysqlutils ndbjtie)
 
   INCLUDE_DIRECTORIES(${JNI_INCLUDE_DIRS})

No bundle (reason: useless for push emails).