ndb merge fix

b63df84b · unknown · cf358493 · b63df84b
Commit b63df84b authored Sep 21, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

ndb/src/kernel/blocks/dbtup/Dbtup.hpp ndb/src/kernel/blocks/dbtup/Dbtup.hpp +1 -2

No files found.
--- a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
@@ -1791,8 +1791,7 @@ private:
                       Uint32* const mainBuffer,
                       Uint32& noMainWords,
                       Uint32* const copyBuffer,
-                       Uint32& noCopyWords,
+                       Uint32& noCopyWords);
-		       bool xfrm);
  void sendTrigAttrInfo(Signal*        signal, 
                        Uint32*        data,