bzr push into mysql-trunk-cluster branch (magnus.blaudd:3370 to 3371)

[magnus.blaudd]

 3371 magnus.blaudd@stripped	2011-09-30 [merge]
      Merge

    modified:
      mysql-test/suite/ndb/t/clusterj_jpa.test
      storage/ndb/clusterj/CMakeLists.txt
      storage/ndb/clusterj/clusterj-jpatest/src/main/java/com/mysql/clusterj/jpatest/TimestampAsSqlTimestampTest.java
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
 3370 magnus.blaudd@stripped	2011-09-30 [merge]
      Merge

    modified:
      cmake/configure.pl
      include/my_base.h
      sql/abstract_query_plan.cc
      sql/binlog.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_cond.cc
      sql/ha_ndbcluster_cond.h
      sql/ha_ndbcluster_connection.cc
      sql/ha_ndbcluster_push.cc
      sql/ha_ndbcluster_push.h
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/rpl_injector.h
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_reporting.cc
      sql/sql_select.cc
      sql/table.cc
      storage/archive/archive_reader.c
      storage/ndb/CMakeLists.txt
=== modified file 'mysql-test/suite/ndb/t/clusterj_jpa.test'
--- a/mysql-test/suite/ndb/t/clusterj_jpa.test	2010-03-25 10:06:13 +0000
+++ b/mysql-test/suite/ndb/t/clusterj_jpa.test	2011-09-07 10:23:37 +0000
@@ -33,7 +33,7 @@ create table decimaltypes (
 --let JAVA_JVM_OPTS= -ea -Xcheck:jni -Dclusterj.properties=$MYSQLTEST_VARDIR/tmp/clusterj.properties
 --let JAVA_JVM_OPTS_1= -Djava.library.path="$NDBCLIENT_LIB_DIR"
 --let JAVA_JVM_OPTS_2= -Dopenjpa.ConnectionDriverName="com.mysql.jdbc.Driver"
---let JAVA_JVM_OPTS_3= -Dopenjpa.ConnectionURL="jdbc:mysql://localhost:$MASTER_MYPORT/test?user=root"
+--let JAVA_JVM_OPTS_3= -Dopenjpa.ConnectionURL="jdbc:mysql://localhost:$MASTER_MYPORT/test" -Dopenjpa.ConnectionUserName="root"
 --let JAVA_JVM_OPTS_4= -Dopenjpa.ndb.connectString="$NDB_CONNECTSTRING"
 --let JAVA_JVM_OPTS_5= -Dcom.mysql.clusterj.jpa.PersistenceUnit="enhance"
 --let JAVA_JVM_OPTS_6= -Dopenjpa.jdbc.SynchronizeMappings="buildSchema(ForeignKeys=true,SchemaAction='add,deleteTableContents')"

=== modified file 'storage/ndb/clusterj/CMakeLists.txt'
--- a/storage/ndb/clusterj/CMakeLists.txt	2011-07-31 10:04:20 +0000
+++ b/storage/ndb/clusterj/CMakeLists.txt	2011-09-06 14:49:02 +0000
@@ -26,7 +26,7 @@ IF("${WITH_CLASSPATH}" MATCHES "openjpa-
 ENDIF()
 
 SET(DEP ndbjtie.jar
-        tie.jar
+        jtie.jar
         clusterj-api.jar
         clusterj-core.jar
         clusterj-tie.jar)

=== 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() {

=== modified file 'storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt'
--- a/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2011-07-31 10:04:20 +0000
+++ b/storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt	2011-09-06 14:49:02 +0000
@@ -14,7 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 SET(DEP ndbjtie.jar
-        tie.jar
+        jtie.jar
         clusterj-api.jar
         clusterj-core.jar
         clusterj-tie.jar)

No bundle (reason: useless for push emails).