bzr push into mysql-5.1-telco-7.1 branch (bernd.ocklin:4665 to 4666)

[Bernd Ocklin]

 4666 Bernd Ocklin	2012-11-20
      fix clusterj tests with odd java path names

    modified:
      mysql-test/lib/My/Exec.pm
      mysql-test/suite/ndb/include/have_java.inc
      mysql-test/suite/ndb/include/run_java.inc
 4665 Mauritz Sundell	2012-11-15 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/test/ndbapi/testMgm.cpp
=== modified file 'mysql-test/lib/My/Exec.pm'
--- a/mysql-test/lib/My/Exec.pm	2012-10-17 10:23:31 +0000
+++ b/mysql-test/lib/My/Exec.pm	2012-11-20 14:44:34 +0000
@@ -35,6 +35,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";

No bundle (reason: useless for push emails).