From 47d971621b27444f353c023dea38ca7b935ec1b9 Mon Sep 17 00:00:00 2001 From: "jonas@perch.ndb.mysql.com" <> Date: Tue, 15 Aug 2006 08:47:49 +0200 Subject: [PATCH] ndb - Fix ndb_condition_pushdown (5.0->5.1 merge error) --- storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp index d7f587101b9..dc1b194eed2 100644 --- a/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp +++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp @@ -1677,7 +1677,9 @@ int Dbtup::interpreterStartLab(Signal* signal, RlogSize= TnoDataRW; } else { jam(); - tupkeyErrorLab(signal); + /** + * TUPKEY REF is sent from within interpreter + */ return -1; } }