bzr push into mysql-5.1-telco-7.1 branch (jonas.oreland:4272 to 4273)

[jonas oreland]

 4273 jonas oreland	2011-09-06
      ndb - fix openjpa connecthandling

    modified:
      mysql-test/suite/ndb/t/clusterj_jpa.test
 4272 Jonas Oreland	2011-09-06 [merge]
      ndb - merge 70 to 71

    modified:
      storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
=== 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-06 14:50:17 +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')"

No bundle (reason: useless for push emails).