bzr push into mysql-5.5-cluster-7.2 branch (mysql-re_ww_grp:3964 to 3965)

[MySQL Release Engineering]

 3965 Karen Langford	2012-07-07
      Cluster patches for 7.2

    modified:
      sql/rpl_utility.h
      storage/ndb/src/dummy.cpp
 3964 magnus.blaudd@stripped	2012-07-05 {clone-mysql-5.5.25a-ndb-7.2.7-src-build} [merge]
      Merge 7.1 -> 7.2

    added:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/TableWithoutPKTest.java
      storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/TableWithoutPKTest.java
    modified:
      mysql-test/suite/ndb/t/clusterj.test
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/metadata/DomainTypeHandlerImpl.java
      storage/ndb/clusterj/clusterj-core/src/main/resources/com/mysql/clusterj/core/Bundle.properties
      storage/ndb/clusterj/clusterj-test/src/main/resources/schema.sql
=== modified file 'sql/rpl_utility.h'
--- a/sql/rpl_utility.h	2012-06-07 15:27:15 +0000
+++ b/sql/rpl_utility.h	2012-07-06 23:48:33 +0000
@@ -271,7 +271,7 @@ private:
 public:
   Deferred_log_events(Relay_log_info *rli);
   ~Deferred_log_events();
-  /* queue for exection at Query-log-event time prior the Query */;
+  /* queue for exection at Query-log-event time prior the Query */
   int add(Log_event *ev);
   bool is_empty();
   bool execute(Relay_log_info *rli);

=== modified file 'storage/ndb/src/dummy.cpp'
--- a/storage/ndb/src/dummy.cpp	2012-05-08 09:18:50 +0000
+++ b/storage/ndb/src/dummy.cpp	2012-07-06 23:48:33 +0000
@@ -1,9 +1,7 @@
 #include "../include/ndbapi/NdbApi.hpp"
 
 typedef void (Ndb_cluster_connection::* fptr)(const char*);
+typedef int (NdbScanFilter::* ndbScanFilterPtr)();
 
-NDB_EXPORT fptr functions[] = {
-  (fptr)&Ndb_cluster_connection::set_name,
-  (fptr)&NdbScanFilter::isfalse,
-  0
-};
+NDB_EXPORT fptr f1 = (fptr)&Ndb_cluster_connection::set_name;
+NDB_EXPORT ndbScanFilterPtr f2 = (ndbScanFilterPtr)&NdbScanFilter::isfalse;

No bundle (reason: useless for push emails).