From: Kent Boortz
Date: September 27 2012 11:41pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (kent.boortz:3978 to 3979)
List-Archive: http://lists.mysql.com/commits/144904
Message-Id: <20120927234139.26139.41952.3979@helheim.no.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3979 Kent Boortz	2012-09-28
      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
 3978 kent.boortz@stripped	2012-09-27
      applying patch for br14675191

    modified:
      VERSION
      mysql-test/mysql-test-run.pl
      storage/ndb/include/kernel/signaldata/DihScanTab.hpp
      storage/ndb/include/kernel/signaldata/TcContinueB.hpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dbspj/Dbspj.hpp
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testScan.cpp
      storage/ndb/test/ndbapi/testSpj.cpp
=== 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-09-27 23:41:03 +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-09-27 23:41:03 +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-09-27 23:41:03 +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	2012-06-13 17:20:48 +0000
+++ b/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2012-09-27 23:41:03 +0000
@@ -45,5 +45,5 @@ CREATE_JAR(clusterjpa ${JAVA_SOURCES}
               src/main/resources/com
   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-09-27 23:41:03 +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).