List:Commits« Previous MessageNext Message »
From:Bernd Ocklin Date:May 20 2010 11:55am
Subject:bzr push into mysql-5.1-telco-7.1 branch (bernhard.ocklin:3610 to 3611)
View as plain text  
 3611 Bernd Ocklin	2010-05-20
      adopt java path finding to trd java path spagetti

    modified:
      mysql-test/suite/ndb/include/have_java.inc
 3610 Frazer Clement	2010-05-19 [merge]
      Merge 7.0->7.1

    modified:
      mysql-test/suite/ndb/r/ndb_native_default_support.result
      mysql-test/suite/ndb/t/ndb_native_default_support.test
=== modified file 'mysql-test/suite/ndb/include/have_java.inc'
--- a/mysql-test/suite/ndb/include/have_java.inc	2010-05-06 13:51:24 +0000
+++ b/mysql-test/suite/ndb/include/have_java.inc	2010-05-20 11:40:06 +0000
@@ -66,7 +66,6 @@ my $pathsep = "/";
 
 if(!IS_WINDOWS)
 {
-  push(@arch_paths, ('/usr/local/jdk', '/usr/local/java', '/usr/local/java/jdk'));
   push(@arch_paths, ('/usr/lib/jvm/java', '/usr/lib64/jvm/java'));
 
   $java_args = "-d32";
@@ -76,6 +75,10 @@ if(!IS_WINDOWS)
   if ($bits == 64) {
     map { $_ . "-64" } @arch_paths;
     $java_args = "-d64";
+    push(@arch_paths, ('/usr/local/jdk', '/usr/local/java', '/usr/local/java/jdk'));
+    push(@arch_paths, ('/usr/java-local/jdk-64/', '/usr/local/jdk-64', '/usr/local/java/jdk-64'));
+  } else {
+    push(@arch_paths, ('/usr/local/jdk', '/usr/local/java', '/usr/local/java/jdk'));
   }
 }
 else
@@ -105,7 +108,7 @@ sub java_exists {
    my $devnull = "/dev/null";
    $devnull = "NUL" if IS_WINDOWS;
 
-   system($exists . " -version > " . $devnull);
+   system($exists . " " . $java_args . " -version > " . $devnull);
    my $ret =  $exists if ($? == 0);
    return $ret; 
 }


Attachment: [text/bzr-bundle]
Thread
bzr push into mysql-5.1-telco-7.1 branch (bernhard.ocklin:3610 to 3611)Bernd Ocklin20 May