diff options
| author | unknown <jonas@perch.ndb.mysql.com> | 2006-08-04 08:41:50 +0200 |
|---|---|---|
| committer | unknown <jonas@perch.ndb.mysql.com> | 2006-08-04 08:41:50 +0200 |
| commit | fc1eeba8be206fad26008ff1c6621d7af908d226 (patch) | |
| tree | 1b02b5d7e7415bcdb3ac55fc9807355213ea0e40 /ndb/src/kernel/blocks/dbtup | |
| parent | 282ff5f14910beac20366260738c838355d8351b (diff) | |
| parent | f287b4a8c8eb5890a38f18461b94fa11fc85e600 (diff) | |
| download | mariadb-git-fc1eeba8be206fad26008ff1c6621d7af908d226.tar.gz | |
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
Diffstat (limited to 'ndb/src/kernel/blocks/dbtup')
| -rw-r--r-- | ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp index f83f21f14d8..13c0bad9c7a 100644 --- a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +++ b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp @@ -1113,14 +1113,16 @@ Dbtup::updateStartLab(Signal* signal, regOperPtr->pageOffset, &cinBuffer[0], regOperPtr->attrinbufLen); - if (retValue == -1) { - tupkeyErrorLab(signal); - return -1; - }//if } else { jam(); retValue = interpreterStartLab(signal, pagePtr, regOperPtr->pageOffset); }//if + + if (retValue == -1) { + tupkeyErrorLab(signal); + return -1; + }//if + ndbrequire(regOperPtr->tupVersion != ZNIL); pagePtr->pageWord[regOperPtr->pageOffset + 1] = regOperPtr->tupVersion; if (regTabPtr->checksumIndicator) { |