diff options
| author | unknown <mskold@mysql.com> | 2006-06-09 12:07:04 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-06-09 12:07:04 +0200 |
| commit | b2d3ac1b6bd14493c03f6d58c624b47a3557e918 (patch) | |
| tree | a2c7253b265f773570f5662467b0ee076e0b7510 /ndb/include/ndbapi/NdbScanOperation.hpp | |
| parent | 753b44e581249a243aba37bc0e6ef7d2cfcec295 (diff) | |
| parent | 20e54ae6c579167c38ae9183e465f19ef0e60169 (diff) | |
| download | mariadb-git-b2d3ac1b6bd14493c03f6d58c624b47a3557e918.tar.gz | |
Merge mysql.com:/home/marty/MySQL/mysql-4.1
into mysql.com:/home/marty/MySQL/mysql-5.0
ndb/src/ndbapi/ndberror.c:
Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
Merge (keeping local)
BitKeeper/deleted/.del-NdbResultSet.hpp~e0042f4c18088ff6:
Merge (keeping local)
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Merge
ndb/include/ndbapi/NdbScanOperation.hpp:
Merge
ndb/src/ndbapi/NdbScanOperation.cpp:
Merge
sql/ha_ndbcluster.cc:
Merge (using local, will fix manually)
sql/ha_ndbcluster.h:
Merge
Diffstat (limited to 'ndb/include/ndbapi/NdbScanOperation.hpp')
| -rw-r--r-- | ndb/include/ndbapi/NdbScanOperation.hpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ndb/include/ndbapi/NdbScanOperation.hpp b/ndb/include/ndbapi/NdbScanOperation.hpp index 77b255dc2f4..6a393223c4c 100644 --- a/ndb/include/ndbapi/NdbScanOperation.hpp +++ b/ndb/include/ndbapi/NdbScanOperation.hpp @@ -61,11 +61,10 @@ public: #ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED /** * readTuples - * * @param lock_mode Lock mode * @param batch No of rows to fetch from each fragment at a time * @param parallel No of fragments to scan in parallell - * @note specifying 0 for batch and parallall means max performance + * @note specifying 0 for batch and parallell means max performance */ #ifdef ndb_readtuples_impossible_overload int readTuples(LockMode lock_mode = LM_Read, |