diff options
| author | unknown <mskold@mysql.com> | 2006-03-23 22:39:30 +0100 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2006-03-23 22:39:30 +0100 |
| commit | b436ae59d5d7dc753f01e711a49bb605882cceca (patch) | |
| tree | 663cd6576766a904a568b03694fc5fac1783e4b7 /storage/ndb/src/ndbapi/NdbScanOperation.cpp | |
| parent | d4c8ca0ca79afd3dd34a8aea4e75e9a7c38bb626 (diff) | |
| parent | 65942df9c992fa78e81b401fbb684b1f05c8bb4f (diff) | |
| download | mariadb-git-b436ae59d5d7dc753f01e711a49bb605882cceca.tar.gz | |
Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
mysql-test/r/ndb_insert.result:
Auto merged
mysql-test/r/ndb_replace.result:
Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Keeping local and do manual merge
sql/ha_ndbcluster.h:
Keeping local and do hand merge
Diffstat (limited to 'storage/ndb/src/ndbapi/NdbScanOperation.cpp')
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbScanOperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp index c841a371af9..ad80d2e7c0c 100644 --- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp @@ -37,8 +37,8 @@ #define DEBUG_NEXT_RESULT 0 -NdbScanOperation::NdbScanOperation(Ndb* aNdb) : - NdbOperation(aNdb), +NdbScanOperation::NdbScanOperation(Ndb* aNdb, NdbOperation::Type aType) : + NdbOperation(aNdb, aType), m_transConnection(NULL) { theParallelism = 0; @@ -1032,7 +1032,7 @@ NdbScanOperation::getBlobHandle(Uint32 anAttrId) } NdbIndexScanOperation::NdbIndexScanOperation(Ndb* aNdb) - : NdbScanOperation(aNdb) + : NdbScanOperation(aNdb, NdbOperation::OrderedIndexScan) { } |