Commit 17f82aa3 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
parents fd2c17db f3463a8c

storage/ndb/include/ndbapi/NdbScanOperation.hpp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public: 
#ifdef ndb_readtuples_impossible_overload

  int readTuples(LockMode lock_mode = LM_Read, 

		 Uint32 batch = 0, Uint32 parallel = 0, 

                 bool keyinfo = false, bool multi_range);

                 bool keyinfo = false, bool multi_range = false);

#endif

  

  inline int readTuples(int parallell){