Commit 17f82aa3 authored by unknown's avatar unknown

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
...@@ -74,7 +74,7 @@ public: ...@@ -74,7 +74,7 @@ public:
#ifdef ndb_readtuples_impossible_overload #ifdef ndb_readtuples_impossible_overload
int readTuples(LockMode lock_mode = LM_Read, int readTuples(LockMode lock_mode = LM_Read,
Uint32 batch = 0, Uint32 parallel = 0, Uint32 batch = 0, Uint32 parallel = 0,
bool keyinfo = false, bool multi_range); bool keyinfo = false, bool multi_range = false);
#endif #endif
inline int readTuples(int parallell){ inline int readTuples(int parallell){
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment