From: MySQL Release Engineering
Date: July 3 2012 10:28pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (mysql-re_ww_grp:3909 to 3910)
List-Archive: http://lists.mysql.com/commits/144364
Message-Id: <20120703222806.13401.1007.3910@helheim.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3910 Kent Boortz	2012-07-04
      Use the same version string when building and installing JAR files

    modified:
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/clusterj/clusterj-api/CMakeLists.txt
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
 3909 Joerg Bruehe	2012-06-01
      Yet another man page: ndb-common-options.

    modified:
      VERSION
      support-files/mysql.spec.sh
=== modified file 'storage/ndb/clusterj/CMakeLists.txt'
--- a/storage/ndb/clusterj/CMakeLists.txt	2011-11-22 10:13:39 +0000
+++ b/storage/ndb/clusterj/CMakeLists.txt	2012-07-03 22:26:58 +0000
@@ -62,5 +62,5 @@ CREATE_JAR(clusterj
   MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/clusterj_manifest.mf
   DEPENDENCIES ${DEP} )
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-${MYSQL_CLUSTER_VERSION}.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

=== modified file 'storage/ndb/clusterj/clusterj-api/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-api/CMakeLists.txt	2011-11-24 12:25:32 +0000
+++ b/storage/ndb/clusterj/clusterj-api/CMakeLists.txt	2012-07-03 22:26:58 +0000
@@ -31,5 +31,5 @@ CREATE_JAR(clusterj-api ${JAVA_SOURCES}
   CLASSPATH target/classes
   MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/manifest.mf)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-api-${MYSQL_CLUSTER_VERSION}.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-api-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

=== modified file 'storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt	2011-11-24 12:25:32 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt	2012-07-03 22:26:58 +0000
@@ -43,5 +43,5 @@ CREATE_JAR(clusterj-jpatest ${JAVA_SOURC
   EXTRA_FILES src/main/resources/META-INF
   BROKEN_JAVAC ${BROKEN_JAVAC})
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-jpatest-${MYSQL_CLUSTER_VERSION}.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-jpatest-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

=== 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-07-03 22:26:58 +0000
@@ -43,5 +43,5 @@ CREATE_JAR(clusterjpa ${JAVA_SOURCES}
   DEPENDENCIES ${DEP}
   MERGE_JARS ${JARS})
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterjpa-${MYSQL_CLUSTER_VERSION}.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterjpa-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

=== modified file 'storage/ndb/clusterj/clusterj-test/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-test/CMakeLists.txt	2011-11-24 12:25:32 +0000
+++ b/storage/ndb/clusterj/clusterj-test/CMakeLists.txt	2012-07-03 22:26:58 +0000
@@ -46,5 +46,5 @@ CREATE_JAR(clusterj-test ${JAVA_SOURCES}
               src/main/resources/schema.sql
   BROKEN_JAVAC ${BROKEN_JAVAC})
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-test-${MYSQL_CLUSTER_VERSION}.jar
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/clusterj-test-${JAVA_NDB_VERSION}.jar
         DESTINATION ${INSTALL_MYSQLSHAREDIR}/java COMPONENT ClusterJ)

No bundle (reason: useless for push emails).