From 3e520aae6301995b54ff1310e434f1a8cebeaa18 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Wed, 27 Jan 2021 15:20:45 +0000
Subject: [PATCH] MCOL-4188 Return true to process the error message from PP in
 ExeMgr

---
 dbcon/joblist/batchprimitiveprocessor-jl.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dbcon/joblist/batchprimitiveprocessor-jl.cpp b/dbcon/joblist/batchprimitiveprocessor-jl.cpp
index 56ee5b984..4543a843e 100644
--- a/dbcon/joblist/batchprimitiveprocessor-jl.cpp
+++ b/dbcon/joblist/batchprimitiveprocessor-jl.cpp
@@ -707,6 +707,14 @@ bool BatchPrimitiveProcessorJL::countThisMsg(messageqcpp::ByteStream& in) const
 
     if (_hasScan && in.length() > offset)
     {
+        // This is a legitimate error message sent by PrimProc
+        // so we need to return to allow upper layer to throw an error
+        // if needed.
+        if (hdr->Status > 0)
+        {
+            return true;
+        }
+
         if (data[offset] != 0)
             offset += (data[offset + CP_FLAG_AND_LBID] * 2) + CP_FLAG_AND_LBID + 1;  // skip the CP data with wide min/max values (16/32 bytes each)
         else