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

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

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
270fd100 · mskold/marty@linux.site · b13e5b8e · 259d3dce · 270fd100
Commit 270fd100 authored Feb 07, 2007 by mskold/marty@linux.site
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/ndb/include/ndbapi/NdbScanOperation.hpp storage/ndb/include/ndbapi/NdbScanOperation.hpp +1 -1

No files found.
--- a/storage/ndb/include/ndbapi/NdbScanOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbScanOperation.hpp
@@ -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){