bk commit into 5.1 tree (frazer:1.2543) BUG#35854

[Frazer Clement]

Below is the list of changes that have just been committed into a local
5.1 repository of frazer.  When frazer 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, 2008-04-07 10:56:30+01:00, frazer@stripped +2 -0
  Bug#35854 getNdbOperation method removed from NdbScanFilter
  
  Replacing method in NdbScanFilter

  storage/ndb/include/ndbapi/NdbScanFilter.hpp@stripped, 2008-04-07 10:56:21+01:00, frazer@stripped +9 -0
    Bug#35854 getNdbOperation method removed from NdbScanFilter
    
    Replacing method in NdbScanFilter

  storage/ndb/src/ndbapi/NdbScanFilter.cpp@stripped, 2008-04-07 10:56:23+01:00, frazer@stripped +9 -0
    Bug#35854 getNdbOperation method removed from NdbScanFilter
    
    Replacing method in NdbScanFilter

diff -Nrup a/storage/ndb/include/ndbapi/NdbScanFilter.hpp b/storage/ndb/include/ndbapi/NdbScanFilter.hpp
--- a/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2008-02-19 15:00:27 +00:00
+++ b/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2008-04-07 10:56:21 +01:00
@@ -220,6 +220,15 @@ public:
    */
   const NdbInterpretedCode* getInterpretedCode() const;
 
+  /**
+   * Get NdbScanFilter's associated NdbScanOperation
+   * 
+   * Where the NdbScanFilter was constructed with an NdbOperation
+   * this method can be used to obtain a pointer to the NdbOperation
+   * object.
+   * For other NdbScanFilter objects it will return NULL
+   */
+  NdbOperation * getNdbOperation() const;
 private:
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
   friend class NdbScanFilterImpl;
diff -Nrup a/storage/ndb/src/ndbapi/NdbScanFilter.cpp b/storage/ndb/src/ndbapi/NdbScanFilter.cpp
--- a/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2008-02-19 15:00:27 +00:00
+++ b/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2008-04-07 10:56:23 +01:00
@@ -668,6 +668,15 @@ NdbScanFilter::getInterpretedCode() cons
   return m_impl.m_code;
 }
 
+NdbOperation*
+NdbScanFilter::getNdbOperation() const
+{
+  /* Return associated NdbOperation (or NULL
+   * if we don't have one)
+   */
+  return m_impl.m_associated_op;
+}
+
 #if 0
 int
 main(void){