bzr push into mysql-5.5-cluster-7.2 branch (john.duncan:3936 to 3937) Bug#14192154

[John David Duncan]

 3937 John David Duncan	2012-06-13
      bug#14192154 -- the file:
         META-INF/services/org.apache.openjpa.lib.conf.ProductDerivation 
      was missing from the clusterjpa.jar file.

    modified:
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
 3936 Mauritz Sundell	2012-06-11 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryOrderingTest.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordIndexScanOperationImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/NdbRecordScanOperationImpl.java
      storage/ndb/clusterj/clusterj-unit/src/main/java/junit/framework/TestCase.java
      storage/ndb/include/ndb_config.h.in
      storage/ndb/include/ndbapi/Ndb.hpp
      storage/ndb/include/portlib/NdbSleep.h
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/ndb_configure.cmake
      storage/ndb/src/common/transporter/TCP_Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.cpp
      storage/ndb/src/common/transporter/Transporter.hpp
      storage/ndb/src/common/util/HashMap2.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/ndbapi/Ndb.cpp
      storage/ndb/src/ndbapi/Ndbinit.cpp
      storage/ndb/src/ndbapi/Ndblist.cpp
      storage/ndb/test/ndbapi/flexAsynch.cpp
=== modified file 'storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2011-11-24 12:25:32 +0000
+++ b/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2012-06-13 17:20:48 +0000
@@ -41,6 +41,8 @@ CREATE_JAR(clusterjpa ${JAVA_SOURCES}
   CLASSPATH ${CLASSPATH}
   MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/clusterjpa_manifest.mf
   DEPENDENCIES ${DEP}
+  EXTRA_FILES src/main/resources/META-INF
+              src/main/resources/com
   MERGE_JARS ${JARS})
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterjpa-${MYSQL_CLUSTER_VERSION}.jar

No bundle (reason: useless for push emails).