From 9d41a3ead59ec6684c6fea8d6a8657d97852214f Mon Sep 17 00:00:00 2001
From: unknown <jonas@perch.ndb.mysql.com>
Date: Wed, 18 Oct 2006 10:07:02 +0200
Subject: [PATCH] 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)
---
.../src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
index 3118164bad..d9710cc254 100644
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
@@ -1039,22 +1039,19 @@ int Dbtup::handleUpdateReq(Signal* signal,
tup_version= (tup_version + 1) & ZTUP_VERSION_MASK;
operPtrP->tupVersion= tup_version;
- int retValue;
if (!req_struct->interpreted_exec) {
jam();
- retValue= updateAttributes(req_struct,
- &cinBuffer[0],
- req_struct->attrinfo_len);
+ int retValue = updateAttributes(req_struct,
+ &cinBuffer[0],
+ req_struct->attrinfo_len);
+ if (unlikely(retValue == -1))
+ goto error;
} else {
jam();
if (unlikely(interpreterStartLab(signal, req_struct) == -1))
return -1;
}
- if (retValue == -1) {
- goto error;
- }
-
if (regTabPtr->need_shrink())
{
shrink_tuple(req_struct, sizes+2, regTabPtr, disk);
@@ -1073,7 +1070,7 @@ int Dbtup::handleUpdateReq(Signal* signal,
jam();
setChecksum(req_struct->m_tuple_ptr, regTabPtr);
}
- return retValue;
+ return 0;
error:
tupkeyErrorLab(signal);
--
GitLab