From: John David Duncan
Date: May 17 2011 7:20pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (john.duncan:4201)
List-Archive: http://lists.mysql.com/commits/137613
Message-Id: <201105171920.p4HJKYfJ015185@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1882347044=="

--===============1882347044==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/jdd/bzr-repo/working/mysql-5.1-telco-7.1/ based on revid:john.duncan@stripped

 4201 John David Duncan	2011-05-17
      In mtr tests to find Java, echo the found Java's version number.

    modified:
      mysql-test/suite/ndb/include/have_java.inc
=== modified file 'mysql-test/suite/ndb/include/have_java.inc'
--- a/mysql-test/suite/ndb/include/have_java.inc	2010-05-20 11:40:06 +0000
+++ b/mysql-test/suite/ndb/include/have_java.inc	2011-05-17 19:19:34 +0000
@@ -98,6 +98,7 @@ push(@java_paths, @arch_paths);
 push(@java_paths, "*"); # empty path for "java on PATH variable"
 
 my $java_loc = "";
+our $java_version = "";
 
 sub java_exists {
    my ($path, $exe) = @_;
@@ -109,8 +110,16 @@ sub java_exists {
    $devnull = "NUL" if IS_WINDOWS;
 
    system($exists . " " . $java_args . " -version > " . $devnull);
+  
    my $ret =  $exists if ($? == 0);
-   return $ret; 
+   if($? == 0) {
+     my $ret = $exists;
+     open(VER, "$exists  -version 2>&1 |");
+     $java_version = <VER>;
+     close(VER);
+   }
+   
+   return $ret;
 }
 
 foreach my $path (@java_paths) 
@@ -125,14 +134,14 @@ foreach my $path (@java_paths) 
     # std case
     $path .= $pathsep . "bin";
   }
-
+ 
   my $tmp = java_exists($path, "java");
 
   if ($tmp ne "") 
   {
      $java_loc = $tmp;
      last;
-  }
+   }
 }
 
 my $vardir = $ENV{MYSQLTEST_VARDIR} or die "Need MYSQLTEST_VARDIR";
@@ -142,7 +151,9 @@ if ($java_loc eq '') {
 } else {
   print $F "--let \MTR_JAVA= $java_loc\n";
   print $F "--let \MTR_JAVA_ARGS= $java_args\n";
+  print $F "--let \MTR_JAVA_VERSION= $java_version\n";
   print $F "--echo Found Java: '\$MTR_JAVA'\n";
+  print $F "--echo Java version: '\$MTR_JAVA_VERSION'\n";
 }
 $F->close();
 


--===============1882347044==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/john.duncan@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: john.duncan@stripped
# target_branch: file:///Users/jdd/bzr-repo/working/mysql-5.1-telco-\
#   7.1/
# testament_sha1: 0d90cfc0580a631a8a08aec336d73e20d6be6103
# timestamp: 2011-05-17 12:20:30 -0700
# base_revision_id: john.duncan@stripped\
#   owms8zgcfa0xam0d
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQPVR58AAfTfgCAQVef///cz
nQS////+UAQu7Ngcu9BVmnd4ZJMJTxGTQ9TBRinlPFPU9J6m1PQaYU9IyHlBpAo8hqeU9CT0NE0y
ADAATRoMhphJFMICNDSaepp6SNpDRp6gAaaADQ0GmqaQeoNGhpoA0AAAAAGgASVNNR6ptNPSZGpk
3qjRoaBoPUADQD01AUA+umBE6qEHHwDxQ8OcOiWRMgQCu9VMCaJK3OS4G1qZhsqkRkCigJQFAO7D
AKPUbgfCnz872Yy6e1skgCmf0Sw1vdOtkzM0GMcHwal6pwbX4XsnbMtbpb495iGzsXzwQPdC9KFL
KBSCGscMM7hfpqXBkoaOqB5tShsBGlg4NUNCHQnnc5YJGfKaL1EKhjHx2Xx7gjIse9myXIr96DnB
y6nnnbN6c4tpwICEDqW112WoK4CAlEMdgERSkSRFKigUh85ZoHoQQ6Kn0Ksd3UVfDjX8E8KWFcsy
TsiDvA9d3nyiTTcKUG02ZbRSjNA6aMu/CAzadXG9JZJPoXWULtsc5FvawxQYrDc4touGozmep9M5
8Vbmou5FjnYE1A2VinsN5bTRVKWattNsQw49FZZGTDtTWWqTgchHbtzFEbl23kTMb54XkhZoSGTZ
U0amVDbR6aCoJmuRzDCsML3q1ua0GZmtyWDPMjoWMsS0rnqITYB1BLBGZCBBApkUmKZwc0jsD0HI
CZ0RQSRmsqkx4W9b1itHOCotSLbPEHKtgsJWHvEoXGCcR5SoCRS4rs26q+bTcsO4s5jolfnK6Gqu
hje00Z3IxoTSaJCA5qPxINel6n/gIfrrVDjlSwXkZJum79PpCSOY+BNIAh7ykbUOKzPYW0xvbqKy
RFhfLDUeZXeK34Waw4ogxROHesfQ+QOfaWAWBZ1Dv3bQRJrjFpYG3qZpthIZFDKoiU5T6grP98+J
ET3jZBdgDI832RYOkEXTuFDWCMMJGqRnl06H0dZGKVclAj2Zw/JIuuWIe69jmbR7Qm64qlaZ6jci
44w11wEOBnwzboCQldvMJBbZZTVmw1Rj5qtZy4CZvPVXTW+4kF+bJLOjeShPZiF0oYZIm1LaC7tw
BvZgQG2d41Wre7QPN8pWU2i6LKNgUXSrJAhETRRY1KiQxgbv3pfhyEhwjIFjBbBpEVmHYUbcpGIF
5WF92Uzs5gvvOzYpbiEYaA6TM1/JSt5SKBORMvZDlcDJNEwMC10csRDG3Xuw6pUtzCIpucxUoaLD
inCB3LLhRVTObHV1v2Gp7oiHUhE3LHUUiDuyPRF68HKkMypc44siXfvloj27QQ0AxAjSx6T9QRaA
tnwUbLy+2+bL9ut2VBMrtiRy5MnJ7ukplfyhmFMS4RF4i67Q5TvvKlbC2MaEohA+GlOXxjYs9WwM
BmZnopODc9RSE3ayjCJlA84LuCEp8w8zZJypNVhBoSwCIpTHJRye2EdKnd1oRLM1k2cVROCuJ2In
ImvFcWapRowYFMKEegW5mLaLhNAfxdyRThQkAPVR58A=


--===============1882347044==--