bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3422)

[Jonas Oreland]

#At file:///home/jonas/src/70-spj-svs/ based on revid:jonas@stripped

 3422 Jonas Oreland	2011-02-09
      ndb spj - remove usage of ndb_global.h from public include file. (ndb_global.h is not part of distribution)

    modified:
      storage/ndb/include/ndbapi/NdbReceiver.hpp
=== modified file 'storage/ndb/include/ndbapi/NdbReceiver.hpp'
--- a/storage/ndb/include/ndbapi/NdbReceiver.hpp	2011-02-04 11:45:24 +0000
+++ b/storage/ndb/include/ndbapi/NdbReceiver.hpp	2011-02-09 11:32:07 +0000
@@ -20,7 +20,6 @@
 #define NdbReceiver_H
 #ifndef DOXYGEN_SHOULD_SKIP_INTERNAL  // Not part of public interface
 
-#include <ndb_global.h>
 #include <ndb_types.h>
 
 
@@ -60,7 +59,7 @@ public:
                           NDB_QUERY_OPERATION = 4
   };
   
-  NdbReceiver(Ndb *aNdb, NdbQueryOperationImpl* queryOpImpl=NULL);
+  NdbReceiver(Ndb *aNdb, NdbQueryOperationImpl* queryOpImpl=0);
   int init(ReceiverType type, bool useRec, void* owner);
   void release();
   ~NdbReceiver();
@@ -310,7 +309,9 @@ inline
 const char *
 NdbReceiver::get_row()
 {
-  assert (m_current_row < m_result_rows);
+#ifdef assert
+  assert(m_current_row < m_result_rows);
+#endif
   return m_record.m_row_buffer + (m_current_row++ * m_record.m_row_offset);
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]