bzr push into mysql-5.1-telco-7.1 branch (john.duncan:4206 to 4207)

[John David Duncan]

 4207 John David Duncan	2011-05-18
      mysql-test/suite/ndb/include/have_openjpa.inc: handle CLASSPATH separator for both unix & windows

    modified:
      mysql-test/suite/ndb/include/have_openjpa.inc
 4206 jonas oreland	2011-05-18 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/test/ndbapi/testRestartGci.cpp
=== modified file 'mysql-test/suite/ndb/include/have_openjpa.inc'
--- a/mysql-test/suite/ndb/include/have_openjpa.inc	2011-05-12 20:06:27 +0000
+++ b/mysql-test/suite/ndb/include/have_openjpa.inc	2011-05-19 02:58:00 +0000
@@ -5,15 +5,19 @@
 
 use strict;
 use IO::File;
+use lib "lib/";
+use My::Platform;
 
 my $ok = 0;
 my $classpath = $ENV{'MTR_CLASSPATH'} || '';
 my $vardir = $ENV{MYSQLTEST_VARDIR} or die "Need MYSQLTEST_VARDIR";
 my $jar;
 my $notfound;
+my $sep = (IS_WINDOWS) ? ';' : ':';
 
 # -- look for the openjpa jar file
-foreach $jar (split ':', $classpath) {
+
+foreach $jar (split $sep, $classpath) {
   if($jar =~ m/openjpa/  && -f $jar) {
     $ok = 2;
   }

No bundle (reason: useless for push emails).