bzr push into mysql-5.5-cluster-7.2 branch (bernd.ocklin:4097 to 4100)

[Bernd Ocklin]

 4100 Bernd Ocklin	2012-11-20
      fix clusterj version numbers

    modified:
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
 4099 Bernd Ocklin	2012-11-20
      clusterj test remove junit dependency

    modified:
      mysql-test/suite/ndb/t/clusterj.test
 4098 Bernd Ocklin	2012-11-20 [merge]
      merge 71 to 72

    modified:
      mysql-test/lib/My/Exec.pm
      mysql-test/suite/ndb/include/have_java.inc
      mysql-test/suite/ndb/include/run_java.inc
 4097 magnus.blaudd@stripped	2012-11-16
      rpl_ndb
       - disable rpl_ndb_mixed_implicit_commit
       - add long comment in disabled.def explaining why

    modified:
      mysql-test/suite/rpl_ndb/t/disabled.def
=== modified file 'mysql-test/lib/My/Exec.pm'
--- a/mysql-test/lib/My/Exec.pm	2012-10-17 11:56:01 +0000
+++ b/mysql-test/lib/My/Exec.pm	2012-11-20 19:34:22 +0000
@@ -18,6 +18,7 @@ sub get_logfile_name {
     # Get logfile name
     my @cmd_parts = split(' ', $cmd);
     my $logfile_base = fileparse($cmd_parts[0]);
+    $logfile_base =~ s/[^a-zA-Z0-9_]*//g; 
     my $logfile_name = "";
     my $log_dir = $ENV{MYSQLTEST_VARDIR};
     for my $i (1..100)

=== modified file 'mysql-test/suite/ndb/include/have_java.inc'
--- a/mysql-test/suite/ndb/include/have_java.inc	2011-05-17 19:19:34 +0000
+++ b/mysql-test/suite/ndb/include/have_java.inc	2012-11-20 14:44:34 +0000
@@ -88,7 +88,6 @@ else
   {
     push(@arch_paths, $win_path);
   }
-  $pathsep = "\\";
 }
 
 
@@ -109,12 +108,12 @@ sub java_exists {
    my $devnull = "/dev/null";
    $devnull = "NUL" if IS_WINDOWS;
 
-   system($exists . " " . $java_args . " -version > " . $devnull);
+   system("\"$exists\" " . $java_args . " -version > " . $devnull);
   
    my $ret =  $exists if ($? == 0);
    if($? == 0) {
      my $ret = $exists;
-     open(VER, "$exists  -version 2>&1 |");
+     open(VER, "\"$exists\"  -version 2>&1 |");
      $java_version = <VER>;
      close(VER);
    }

=== modified file 'mysql-test/suite/ndb/include/run_java.inc'
--- a/mysql-test/suite/ndb/include/run_java.inc	2010-03-01 19:24:42 +0000
+++ b/mysql-test/suite/ndb/include/run_java.inc	2012-11-20 14:44:34 +0000
@@ -65,7 +65,7 @@ if ($ENV{MTR_CLASSPATH})
   $java_classpath .= "$sep$ENV{MTR_CLASSPATH}"
 }
 
-my $cmd = "$java $java_args $jvm_opts -classpath \"$java_classpath\" $java_class $class_args";
+my $cmd = "\"$java\" $java_args $jvm_opts -classpath \"$java_classpath\" $java_class $class_args";
 my $res = exec_print_on_error($cmd);
 
 my $vardir = $ENV{MYSQLTEST_VARDIR} || die "Need MYSQLTEST_VARDIR";

=== modified file 'mysql-test/suite/ndb/t/clusterj.test'
--- a/mysql-test/suite/ndb/t/clusterj.test	2012-06-28 23:49:16 +0000
+++ b/mysql-test/suite/ndb/t/clusterj.test	2012-11-20 19:35:25 +0000
@@ -8,7 +8,6 @@
 --source include/not_embedded.inc
 --source suite/ndb/include/have_connectorj.inc
 --source suite/ndb/include/have_java.inc
---source suite/ndb/include/have_junit.inc
 --source suite/ndb/include/have_clusterj.inc
 
 --let JAVA_CLASSPATH=$CLUSTERJ_TEST_JAR

=== modified file 'storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt	2012-10-23 17:58:59 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt	2012-11-20 19:38:24 +0000
@@ -49,5 +49,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-11-20 19:38:24 +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	2012-10-23 17:58:59 +0000
+++ b/storage/ndb/clusterj/clusterj-test/CMakeLists.txt	2012-11-20 19:38:24 +0000
@@ -52,5 +52,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).