=== modified file 'storage/ndb/include/ndbapi/NdbScanOperation.hpp'
--- a/storage/ndb/include/ndbapi/NdbScanOperation.hpp	2008-08-21 06:34:22 +0000
+++ b/storage/ndb/include/ndbapi/NdbScanOperation.hpp	2008-10-07 13:06:47 +0000
@@ -16,7 +16,6 @@
 #ifndef NdbScanOperation_H
 #define NdbScanOperation_H
 
-#include <ndb_global.h>
 #include <NdbOperation.hpp>
 
 class NdbBlob;
@@ -603,27 +602,6 @@
 
 inline
 const NdbOperation *
-NdbScanOperation::lockCurrentTuple(NdbTransaction *takeOverTrans,
-                                   const NdbRecord *result_rec,
-                                   char *result_row,
-                                   const unsigned char *result_mask,
-                                   const NdbOperation::OperationOptions *opts,
-                                   Uint32 sizeOfOptions)
-{
-  unsigned char empty_mask[NDB_MAX_ATTRIBUTES_IN_TABLE>>3];
-  /* Default is to not read any attributes, just take over the lock. */
-  if (!result_row)
-  {
-    bzero(empty_mask, sizeof(empty_mask));
-    result_mask= &empty_mask[0];
-  }
-  return takeOverScanOpNdbRecord(NdbOperation::ReadRequest, takeOverTrans,
-                                 result_rec, result_row, 
-                                 result_mask, opts, sizeOfOptions);
-}
-
-inline
-const NdbOperation *
 NdbScanOperation::updateCurrentTuple(NdbTransaction *takeOverTrans,
                                      const NdbRecord *attr_rec,
                                      const char *attr_row,

=== modified file 'storage/ndb/src/ndbapi/NdbScanOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2008-10-01 07:50:42 +0000
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2008-10-07 13:06:47 +0000
@@ -3453,3 +3453,23 @@
   }
   return -1;
 }
+
+const NdbOperation *
+NdbScanOperation::lockCurrentTuple(NdbTransaction *takeOverTrans,
+                                   const NdbRecord *result_rec,
+                                   char *result_row,
+                                   const unsigned char *result_mask,
+                                   const NdbOperation::OperationOptions *opts,
+                                   Uint32 sizeOfOptions)
+{
+  unsigned char empty_mask[NDB_MAX_ATTRIBUTES_IN_TABLE>>3];
+  /* Default is to not read any attributes, just take over the lock. */
+  if (!result_row)
+  {
+    bzero(empty_mask, sizeof(empty_mask));
+    result_mask= &empty_mask[0];
+  }
+  return takeOverScanOpNdbRecord(NdbOperation::ReadRequest, takeOverTrans,
+                                 result_rec, result_row, 
+                                 result_mask, opts, sizeOfOptions);
+}