[Pkg-mysql-commits] r958 - branches/sid-5.1/debian/patches

[Monty Taylor]

Author: mtaylor-guest
Date: 2007-10-12 06:38:14 +0000 (Fri, 12 Oct 2007)
New Revision: 958

Modified:
   branches/sid-5.1/debian/patches/86_Ndb_connectors_utility_methods.dpatch
Log:
Added a method I'd forgotten about the first time. 


Modified: branches/sid-5.1/debian/patches/86_Ndb_connectors_utility_methods.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/86_Ndb_connectors_utility_methods.dpatch	2007-10-12 03:48:23 UTC (rev 957)
+++ branches/sid-5.1/debian/patches/86_Ndb_connectors_utility_methods.dpatch	2007-10-12 06:38:14 UTC (rev 958)
@@ -5,9 +5,22 @@
 ## DP: Add accessor methods necessary for NDB/Connectors
 
 @DPATCH@
+diff -urNad sid-5.1~/storage/ndb/include/ndbapi/NdbOperation.hpp sid-5.1/storage/ndb/include/ndbapi/NdbOperation.hpp
+--- sid-5.1~/storage/ndb/include/ndbapi/NdbOperation.hpp	2007-09-24 03:30:24.000000000 -0700
++++ sid-5.1/storage/ndb/include/ndbapi/NdbOperation.hpp	2007-10-11 23:11:39.083409489 -0700
+@@ -842,6 +842,9 @@
+   virtual ~NdbOperation();
+   void	next(NdbOperation*);		// Set next pointer		      
+   NdbOperation*	    next();	        // Get next pointer		       
++
++  NdbTransation* getNdbTransaction();
++
+ public:
+ #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL
+   const NdbOperation* next() const;
 diff -urNad sid-5.1~/storage/ndb/include/ndbapi/NdbScanFilter.hpp sid-5.1/storage/ndb/include/ndbapi/NdbScanFilter.hpp
 --- sid-5.1~/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2007-09-24 03:29:58.000000000 -0700
-+++ sid-5.1/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2007-10-11 17:16:21.096566653 -0700
++++ sid-5.1/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2007-10-11 23:09:47.609056928 -0700
 @@ -166,6 +166,7 @@
    /** @} *********************************************************************/
  #endif
@@ -18,7 +31,7 @@
    friend class NdbScanFilterImpl;
 diff -urNad sid-5.1~/storage/ndb/include/ndbapi/NdbTransaction.hpp sid-5.1/storage/ndb/include/ndbapi/NdbTransaction.hpp
 --- sid-5.1~/storage/ndb/include/ndbapi/NdbTransaction.hpp	2007-09-24 03:29:41.000000000 -0700
-+++ sid-5.1/storage/ndb/include/ndbapi/NdbTransaction.hpp	2007-10-11 17:16:21.096566653 -0700
++++ sid-5.1/storage/ndb/include/ndbapi/NdbTransaction.hpp	2007-10-11 23:09:47.609056928 -0700
 @@ -170,6 +170,13 @@
  #endif
    };
@@ -33,9 +46,23 @@
  #ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
    /**
     * Get an NdbOperation for a table.
+diff -urNad sid-5.1~/storage/ndb/src/ndbapi/NdbOperation.cpp sid-5.1/storage/ndb/src/ndbapi/NdbOperation.cpp
+--- sid-5.1~/storage/ndb/src/ndbapi/NdbOperation.cpp	2007-09-24 03:29:31.000000000 -0700
++++ sid-5.1/storage/ndb/src/ndbapi/NdbOperation.cpp	2007-10-11 23:10:43.332232410 -0700
+@@ -429,3 +429,10 @@
+ {
+   return m_currentTable;
+ }
++
++NdbTransaction* 
++NdbOperation::getNdbTransaction()
++{
++  return theNdbCon; 
++}
++
 diff -urNad sid-5.1~/storage/ndb/src/ndbapi/NdbScanFilter.cpp sid-5.1/storage/ndb/src/ndbapi/NdbScanFilter.cpp
 --- sid-5.1~/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2007-09-24 03:30:25.000000000 -0700
-+++ sid-5.1/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2007-10-11 17:16:21.096566653 -0700
++++ sid-5.1/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2007-10-11 23:09:47.609056928 -0700
 @@ -282,6 +282,10 @@
    }
  }