From: Kent Boortz
Date: May 24 2012 6:33pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (kent.boortz:3842 to 3843)
List-Archive: http://lists.mysql.com/commits/143970
Message-Id: <20120524183352.21095.qmail@helheim>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3843 Kent Boortz	2012-05-24
      Reworked patch

    modified:
      storage/ndb/src/dummy.cpp
 3842 Kent Boortz	2012-05-24
      Added missing typedef for NdbScanFilter

    modified:
      storage/ndb/src/dummy.cpp
=== modified file 'storage/ndb/src/dummy.cpp'
--- a/storage/ndb/src/dummy.cpp	2012-05-24 13:22:00 +0000
+++ b/storage/ndb/src/dummy.cpp	2012-05-24 18:16:00 +0000
@@ -1,10 +1,7 @@
 #include "../include/ndbapi/NdbApi.hpp"
 
 typedef void (Ndb_cluster_connection::* fptr)(const char*);
-typedef int (NdbScanFilter::* fptr)();
+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).