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

[jonas oreland]

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

 3426 jonas oreland	2011-02-10 [merge]
      ndb spj - merge 70

    modified:
      storage/ndb/src/ndbapi/TransporterFacade.hpp
=== modified file 'storage/ndb/src/ndbapi/TransporterFacade.hpp'
--- a/storage/ndb/src/ndbapi/TransporterFacade.hpp	2011-02-04 11:45:24 +0000
+++ b/storage/ndb/src/ndbapi/TransporterFacade.hpp	2011-02-10 08:22:41 +0000
@@ -346,13 +346,16 @@ trp_client::getNodeInfo(Uint32 nodeId) c
 class LinearSectionIterator: public GenericSectionIterator
 {
 private :
-  const Uint32* const data;
+  const Uint32* data;
   Uint32 len;
   bool read;
 public :
   LinearSectionIterator(const Uint32* _data, Uint32 _len)
-  : data((_len == 0) ?NULL :_data), len(_len), read(false)
-  {}
+  {
+    data= (_len == 0)? NULL:_data;
+    len= _len;
+    read= false;
+  }
 
   ~LinearSectionIterator()
   {};

No bundle (reason: revision is a merge).