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

[John David Duncan]

 4200 John David Duncan	2011-05-17
      Attempt to fix CLASSPATH issues with ndb.clusterj test on Windows.
      Fix dependency tracking for Make in clusterj.

    modified:
      mysql-test/suite/ndb/include/have_connectorj.inc
      mysql-test/suite/ndb/include/have_junit.inc
      storage/ndb/clusterj/Makefile.am
 4199 Jonas Oreland	2011-05-17 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
=== modified file 'mysql-test/suite/ndb/include/have_connectorj.inc'
--- a/mysql-test/suite/ndb/include/have_connectorj.inc	2011-05-12 20:06:27 +0000
+++ b/mysql-test/suite/ndb/include/have_connectorj.inc	2011-05-17 17:57:32 +0000
@@ -1,6 +1,9 @@
 --perl
 use strict;
 use IO::File;
+use lib "lib/";
+use My::Platform;
+
 
 #
 # Looks for MySQL Connector/J JAR file in MTR_CLASSPATH
@@ -11,11 +14,14 @@ 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 Connctor/J jar file
-foreach $jar (split ':', $classpath) {
+foreach $jar (split $sep, $classpath) {
   if($jar =~ m/mysql-connector/  && -f $jar) {
     $ok = 2;
+    last;
   }
   elsif($jar =~ m/mysql-connector/) {
     $ok = 1;

=== modified file 'mysql-test/suite/ndb/include/have_junit.inc'
--- a/mysql-test/suite/ndb/include/have_junit.inc	2011-05-12 16:04:16 +0000
+++ b/mysql-test/suite/ndb/include/have_junit.inc	2011-05-17 17:57:32 +0000
@@ -1,17 +1,21 @@
 --perl
 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 junit jar file
-foreach $jar (split ':', $classpath) {
+foreach $jar (split $sep, $classpath) {
   if($jar =~ m/junit/  && -f $jar) {
     $ok = 2;
+    last;
   }
   elsif($jar =~ m/junit/) {
     $ok = 1;

=== modified file 'storage/ndb/clusterj/Makefile.am'
--- a/storage/ndb/clusterj/Makefile.am	2011-02-21 11:53:51 +0000
+++ b/storage/ndb/clusterj/Makefile.am	2011-05-17 17:57:32 +0000
@@ -38,6 +38,10 @@ clusterj_DATA = $(clusterj_version_jar)
 
 EXTRA_DIST = pom.xml CMakeLists.txt
 
+class_timestamps = clusterj-api/classclusterj_api.stamp \
+                   clusterj-core/classclusterj_core.stamp \
+                   clusterj-tie/classclusterj_tie.stamp
+
 $(CLUSTERJ_MANIFEST):
 	echo "Manifest-Version: 1.0"  > $(CLUSTERJ_MANIFEST)
 	echo "Export-Package: $(CLUSTERJ_EXPORT)"  >> $(CLUSTERJ_MANIFEST) 
@@ -45,7 +49,7 @@ $(CLUSTERJ_MANIFEST):
 	echo "Bundle-Description: ClusterJ"  >> $(CLUSTERJ_MANIFEST)
 
 # make both clusterj and clusterjpa jar (the latter optional based on OPENJPA_OPT)
-$(clusterj_version_jar) : $(BASE_DIRS) $(CLUSTERJ_TESTS) $(OPENJPA_OPT) $(CLUSTERJ_MANIFEST)
+$(clusterj_version_jar) : $(BASE_DIRS) $(CLUSTERJ_TESTS) $(OPENJPA_OPT) $(CLUSTERJ_MANIFEST) $(class_timestamps)
 	rm -f $(clusterj_version_jar); \
 	@JAR@ cvfm $(clusterj_version_jar) $(CLUSTERJ_MANIFEST); \
 	for i in $(BASE_DIRS); do \

No bundle (reason: useless for push emails).