bk commit into 5.1 tree (mtaylor:1.2578)

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.1 repository of mtaylor. When mtaylor does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-11 22:58:46-07:00, mtaylor@solace.(none) +4 -0
  NdbTransaction.hpp, NdbScanFilter.cpp:
    Added accessor methods for  NDB/Connectors.
  NdbScanFilter.hpp:
    Added accessor methods for NDB/Connectors. 
  NdbPool.hpp:
    Fixed NdbPool header file to match implementation.

  storage/ndb/include/ndbapi/NdbPool.hpp@stripped, 2007-10-11 22:55:59-07:00, mtaylor@solace.(none) +2 -1
    Fixed NdbPool header file to match implementation.

  storage/ndb/include/ndbapi/NdbScanFilter.hpp@stripped, 2007-10-11 22:57:09-07:00, mtaylor@solace.(none) +1 -0
    Added accessor methods for NDB/Connectors. 

  storage/ndb/include/ndbapi/NdbTransaction.hpp@stripped, 2007-10-11 22:58:25-07:00, mtaylor@solace.(none) +7 -0
    Added accessor methods for  NDB/Connectors.

  storage/ndb/src/ndbapi/NdbScanFilter.cpp@stripped, 2007-10-11 22:58:28-07:00, mtaylor@solace.(none) +4 -0
    Added accessor methods for  NDB/Connectors.

diff -Nrup a/storage/ndb/include/ndbapi/NdbPool.hpp b/storage/ndb/include/ndbapi/NdbPool.hpp
--- a/storage/ndb/include/ndbapi/NdbPool.hpp	2006-12-23 11:20:08 -08:00
+++ b/storage/ndb/include/ndbapi/NdbPool.hpp	2007-10-11 22:55:59 -07:00
@@ -17,7 +17,8 @@ class Ndb;
 class NdbPool;
 
 bool
-create_instance(Uint32 max_ndb_objects,
+create_instance(Ndb_cluster_connection* cc,
+                Uint32 max_ndb_objects,
                 Uint32 no_conn_obj,
                 Uint32 init_no_ndb_objects);
 
diff -Nrup a/storage/ndb/include/ndbapi/NdbScanFilter.hpp b/storage/ndb/include/ndbapi/NdbScanFilter.hpp
--- a/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2006-12-23 11:20:08 -08:00
+++ b/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2007-10-11 22:57:09 -07:00
@@ -166,6 +166,7 @@ public:
   /** @} *********************************************************************/
 #endif
 
+  NdbOperation * getNdbOperation();
 private:
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
   friend class NdbScanFilterImpl;
diff -Nrup a/storage/ndb/include/ndbapi/NdbTransaction.hpp b/storage/ndb/include/ndbapi/NdbTransaction.hpp
--- a/storage/ndb/include/ndbapi/NdbTransaction.hpp	2007-04-27 02:46:37 -07:00
+++ b/storage/ndb/include/ndbapi/NdbTransaction.hpp	2007-10-11 22:58:25 -07:00
@@ -170,6 +170,13 @@ public:
 #endif
   };
 
+  /**
+   * Convenience method to fetch this transactions Ndb* object 
+   */
+  Ndb * getNdb() { 
+    return theNdb; 
+  }
+
 #ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
   /**
    * Get an NdbOperation for a table.
diff -Nrup a/storage/ndb/src/ndbapi/NdbScanFilter.cpp b/storage/ndb/src/ndbapi/NdbScanFilter.cpp
--- a/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2007-04-11 06:22:08 -07:00
+++ b/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2007-10-11 22:58:28 -07:00
@@ -282,6 +282,10 @@ NdbScanFilter::isfalse(){
   }
 }
 
+NdbOperation * 
+NdbScanFilter::getNdbOperation(){
+  return m_impl.m_operation; 
+}
 
 #define action(x, y, z)