From: magnus.blaudd
Date: November 21 2012 11:54am
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4668 to 4670)
List-Archive: http://lists.mysql.com/commits/145352
Message-Id: <20121121115432.19379.69694.4670@wholphin>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4670 magnus.blaudd@stripped	2012-11-21
      clusterj
       - look for java before starting to care about what's in classpath
       - theoretically we could use java to check if classpath is correct by doing
        configure style tests written in java. Would avoid need to duplicate classpath
        parsing(which won't have the same rules as in java anyway)

    modified:
      mysql-test/suite/ndb/t/clusterj.test
      mysql-test/suite/ndb/t/clusterj_jpa.test
 4669 magnus.blaudd@stripped	2012-11-21
      clusterj
       - remove last traces of junit dependency

    removed:
      mysql-test/suite/ndb/include/have_junit.inc
    modified:
      mysql-test/suite/ndb/t/clusterj_jpa.test
 4668 Frazer Clement	2012-11-21 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
      storage/ndb/src/kernel/vm/LockQueue.cpp
      storage/ndb/src/kernel/vm/LockQueue.hpp
=== removed file 'mysql-test/suite/ndb/include/have_junit.inc'
--- a/mysql-test/suite/ndb/include/have_junit.inc	2011-05-17 17:57:32 +0000
+++ b/mysql-test/suite/ndb/include/have_junit.inc	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
---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 $sep, $classpath) {
-  if($jar =~ m/junit/  && -f $jar) {
-    $ok = 2;
-    last;
-  }
-  elsif($jar =~ m/junit/) {
-    $ok = 1;
-    $notfound = $jar;
-  }
-}
-
-# -- write the result to the output file
-my $F = IO::File->new("$vardir/tmp/have_junit_result.inc", "w") or die;
-if($ok == 2) {
-  print $F  "--echo Found JUnit JAR in MTR_CLASSPATH\n";
-}
-elsif($ok == 1) {
-  print $F  "--skip JAR file not found: \"$notfound\"\n";
-} 
-else {
-  print $F  "--skip Please specify Junit JAR file in MTR_CLASSPATH env variable\n";
-}
-
-$F->close();
-
-EOF
-
---source $MYSQLTEST_VARDIR/tmp/have_junit_result.inc

=== modified file 'mysql-test/suite/ndb/t/clusterj.test'
--- a/mysql-test/suite/ndb/t/clusterj.test	2012-06-28 23:49:16 +0000
+++ b/mysql-test/suite/ndb/t/clusterj.test	2012-11-21 08:32:47 +0000
@@ -6,8 +6,8 @@
 --source include/have_utf8.inc
 --source include/have_sjis.inc
 --source include/not_embedded.inc
---source suite/ndb/include/have_connectorj.inc
 --source suite/ndb/include/have_java.inc
+--source suite/ndb/include/have_connectorj.inc
 --source suite/ndb/include/have_junit.inc
 --source suite/ndb/include/have_clusterj.inc
 

=== modified file 'mysql-test/suite/ndb/t/clusterj_jpa.test'
--- a/mysql-test/suite/ndb/t/clusterj_jpa.test	2011-09-06 14:50:17 +0000
+++ b/mysql-test/suite/ndb/t/clusterj_jpa.test	2012-11-21 08:32:47 +0000
@@ -6,9 +6,8 @@
 --source include/have_utf8.inc
 --source include/have_sjis.inc
 --source include/not_embedded.inc
---source suite/ndb/include/have_connectorj.inc
 --source suite/ndb/include/have_java.inc
---source suite/ndb/include/have_junit.inc
+--source suite/ndb/include/have_connectorj.inc
 --source suite/ndb/include/have_clusterj.inc
 --source suite/ndb/include/have_clusterj_jpa.inc
 --source suite/ndb/include/have_openjpa.inc

No bundle (reason: useless for push emails).