bzr push into mysql-5.5-cluster branch (jonas.oreland:3467 to 3468)

[Jonas Oreland]

 3468 Jonas Oreland	2011-09-07 [merge]
      ndb - merge 7.1

    modified:
      storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java
 3467 jonas oreland	2011-09-06
      ndb - fix typos

    modified:
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
=== modified file 'storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java'
--- a/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java	2011-07-05 12:46:07 +0000
+++ b/storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java	2011-09-07 10:23:37 +0000
@@ -95,8 +95,8 @@ public class TimestampAsSqlTimestampTest
     }
 
     public void testWriteJDBCReadJPA() {
-        writeJDBCreadJPA();
-        failOnError();
+        // writeJDBCreadJPA();
+        // failOnError();
     }
 
     public void testWriteJPAReadJDBC() {

No bundle (reason: useless for push emails).