Commit de3b0d2d authored by unknown's avatar unknown

ndb -

  Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
parent 86921c18
...@@ -1039,22 +1039,19 @@ int Dbtup::handleUpdateReq(Signal* signal, ...@@ -1039,22 +1039,19 @@ int Dbtup::handleUpdateReq(Signal* signal,
tup_version= (tup_version + 1) & ZTUP_VERSION_MASK; tup_version= (tup_version + 1) & ZTUP_VERSION_MASK;
operPtrP->tupVersion= tup_version; operPtrP->tupVersion= tup_version;
int retValue;
if (!req_struct->interpreted_exec) { if (!req_struct->interpreted_exec) {
jam(); jam();
retValue= updateAttributes(req_struct, int retValue = updateAttributes(req_struct,
&cinBuffer[0], &cinBuffer[0],
req_struct->attrinfo_len); req_struct->attrinfo_len);
if (unlikely(retValue == -1))
goto error;
} else { } else {
jam(); jam();
if (unlikely(interpreterStartLab(signal, req_struct) == -1)) if (unlikely(interpreterStartLab(signal, req_struct) == -1))
return -1; return -1;
} }
if (retValue == -1) {
goto error;
}
if (regTabPtr->need_shrink()) if (regTabPtr->need_shrink())
{ {
shrink_tuple(req_struct, sizes+2, regTabPtr, disk); shrink_tuple(req_struct, sizes+2, regTabPtr, disk);
...@@ -1073,7 +1070,7 @@ int Dbtup::handleUpdateReq(Signal* signal, ...@@ -1073,7 +1070,7 @@ int Dbtup::handleUpdateReq(Signal* signal,
jam(); jam();
setChecksum(req_struct->m_tuple_ptr, regTabPtr); setChecksum(req_struct->m_tuple_ptr, regTabPtr);
} }
return retValue; return 0;
error: error:
tupkeyErrorLab(signal); tupkeyErrorLab(signal);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment