diff options
| author | unknown <joreland@mysql.com> | 2004-10-08 11:06:44 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-10-08 11:06:44 +0200 |
| commit | 8968be812b7416c3bfd7d01a1bbda3751d29c7ae (patch) | |
| tree | 1603df9d71702414d70d9d39650fbe0d41d1d885 /ndb | |
| parent | d6424368a5b6999d9dadbac4605572dc1fc2cd9f (diff) | |
| download | mariadb-git-8968be812b7416c3bfd7d01a1bbda3751d29c7ae.tar.gz | |
Let blobs use committedRead, this is always correct as
as read lock is held on primary table
ndb/src/ndbapi/NdbConnection.cpp:
merge error
Diffstat (limited to 'ndb')
| -rw-r--r-- | ndb/src/ndbapi/NdbBlob.cpp | 10 | ||||
| -rw-r--r-- | ndb/src/ndbapi/NdbConnection.cpp | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ndb/src/ndbapi/NdbBlob.cpp b/ndb/src/ndbapi/NdbBlob.cpp index 7939f54d846..bfc81d4ba95 100644 --- a/ndb/src/ndbapi/NdbBlob.cpp +++ b/ndb/src/ndbapi/NdbBlob.cpp @@ -867,7 +867,7 @@ NdbBlob::readParts(char* buf, Uint32 part, Uint32 count) while (n < count) { NdbOperation* tOp = theNdbCon->getNdbOperation(theBlobTable); if (tOp == NULL || - tOp->readTuple() == -1 || + tOp->committedRead() == -1 || setPartKeyValue(tOp, part + n) == -1 || tOp->getValue((Uint32)3, buf) == NULL) { setErrorCode(tOp); @@ -1144,7 +1144,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch) // add operation before this one to read head+inline NdbOperation* tOp = theNdbCon->getNdbOperation(theTable, theNdbOp); if (tOp == NULL || - tOp->readTuple() == -1 || + tOp->committedRead() == -1 || setTableKeyValue(tOp) == -1 || getHeadInlineValue(tOp) == -1) { setErrorCode(tOp); @@ -1163,7 +1163,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch) Uint32 pkAttrId = theAccessTable->getNoOfColumns() - 1; NdbOperation* tOp = theNdbCon->getNdbOperation(theAccessTable, theNdbOp); if (tOp == NULL || - tOp->readTuple() == -1 || + tOp->committedRead() == -1 || setAccessKeyValue(tOp) == -1 || tOp->getValue(pkAttrId, theKeyBuf.data) == NULL) { setErrorCode(tOp); @@ -1172,7 +1172,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch) } else { NdbOperation* tOp = theNdbCon->getNdbIndexOperation(theAccessTable->m_index, theTable, theNdbOp); if (tOp == NULL || - tOp->readTuple() == -1 || + tOp->committedRead() == -1 || setAccessKeyValue(tOp) == -1 || getTableKeyValue(tOp) == -1) { setErrorCode(tOp); @@ -1184,7 +1184,7 @@ NdbBlob::preExecute(ExecType anExecType, bool& batch) // add op before this one to read head+inline via index NdbIndexOperation* tOp = theNdbCon->getNdbIndexOperation(theAccessTable->m_index, theTable, theNdbOp); if (tOp == NULL || - tOp->readTuple() == -1 || + tOp->committedRead() == -1 || setAccessKeyValue(tOp) == -1 || getHeadInlineValue(tOp) == -1) { setErrorCode(tOp); diff --git a/ndb/src/ndbapi/NdbConnection.cpp b/ndb/src/ndbapi/NdbConnection.cpp index cde14f185ef..c6a88e10f54 100644 --- a/ndb/src/ndbapi/NdbConnection.cpp +++ b/ndb/src/ndbapi/NdbConnection.cpp @@ -528,7 +528,6 @@ NdbConnection::executeAsynchPrepare( ExecType aTypeOfExec, tLastOp->theCommitIndicator = 1; }//if } else { - if (aTypeOfExec == Commit) { if (aTypeOfExec == Commit && !theSimpleState) { /********************************************************************** * A Transaction have been started and no more operations exist. |