summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <pekka@mysql.com>2004-12-03 15:00:57 +0100
committerunknown <pekka@mysql.com>2004-12-03 15:00:57 +0100
commit8f063cecb84658a01771d3f4f24426dc4c1fa3fd (patch)
treee34121207db9a1484b7cebcc3db89e57d3c72a08 /ndb
parentabf0ab9eee5070fd7bd6f284fec8a1ba0216ecb6 (diff)
parentc9215dc241ab3f26ba3eb2139b6130d0872e3aa4 (diff)
downloadmariadb-git-8f063cecb84658a01771d3f4f24426dc4c1fa3fd.tar.gz
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
index 49de0d80bcd..8e3ca6528c2 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
@@ -1113,6 +1113,7 @@ Dbtup::updateStartLab(Signal* signal,
regOperPtr->attrinbufLen);
if (retValue == -1) {
tupkeyErrorLab(signal);
+ return -1;
}//if
} else {
jam();