diff options
| author | unknown <tomas@poseidon.mysql.com> | 2007-02-05 12:19:24 +0700 |
|---|---|---|
| committer | unknown <tomas@poseidon.mysql.com> | 2007-02-05 12:19:24 +0700 |
| commit | e21cdc61f360716fc89a79e333a2e900ce24c6e9 (patch) | |
| tree | fba45f682ac4851c3c755fea338e93fa386ed0dc /storage/ndb/src/ndbapi/NdbScanOperation.cpp | |
| parent | 3f3d9093f9ce6152f5a018a946806c069837e219 (diff) | |
| parent | 6acbe4eb4822dc886e6de20a6ec9ef2200e4127c (diff) | |
| download | mariadb-git-e21cdc61f360716fc89a79e333a2e900ce24c6e9.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
mysql-test/r/ndb_read_multi_range.result:
Auto merged
mysql-test/t/ndb_read_multi_range.test:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
sql/ha_ndbcluster.cc:
manual merge
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
manual merge
Diffstat (limited to 'storage/ndb/src/ndbapi/NdbScanOperation.cpp')
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbScanOperation.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp index fe650827347..ce24d6cee0a 100644 --- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp @@ -994,6 +994,7 @@ NdbScanOperation::takeOverScanOp(OperationType opType, NdbTransaction* pTrans) newOp->theTupKeyLen = len; newOp->theOperationType = opType; + newOp->m_abortOption = AbortOnError; switch (opType) { case (ReadRequest): newOp->theLockMode = theLockMode; |