From a227fccfa4f2bdeeb32a621040c96c75b586580a Mon Sep 17 00:00:00 2001
From: "david.hall" <david.hall@mariadb.com>
Date: Tue, 14 Jun 2022 15:02:05 -0500
Subject: [PATCH] MCOL-4841 compiler fixes

---
 primitives/primproc/batchprimitiveprocessor.h | 3 ++-
 primitives/primproc/bppsendthread.h           | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/primitives/primproc/batchprimitiveprocessor.h b/primitives/primproc/batchprimitiveprocessor.h
index 07261fb45..4469fa6ce 100644
--- a/primitives/primproc/batchprimitiveprocessor.h
+++ b/primitives/primproc/batchprimitiveprocessor.h
@@ -136,7 +136,6 @@ class BatchPrimitiveProcessor
   {
     fBusy = b;
   }
-
   uint16_t FilterCount() const
   {
     return filterCount;
@@ -435,6 +434,8 @@ class BatchPrimitiveProcessor
   bool firstInstance;
   uint64_t valuesLBID;
 
+  static const uint64_t maxResultCount = 1048576;  // 2^20
+
   friend class Command;
   friend class ColumnCommand;
   friend class DictStep;
diff --git a/primitives/primproc/bppsendthread.h b/primitives/primproc/bppsendthread.h
index 77856ee90..615b075c7 100644
--- a/primitives/primproc/bppsendthread.h
+++ b/primitives/primproc/bppsendthread.h
@@ -84,7 +84,7 @@ class BPPSendThread
   {
     return die;
   }
-  void setProcessorPool(threadpool::PriorityThreadPool* processorPool)
+  void setProcessorPool(boost::shared_ptr<threadpool::PriorityThreadPool> processorPool)
   {
     fProcessorPool = processorPool;
   }
@@ -148,7 +148,7 @@ class BPPSendThread
   uint64_t maxByteSize;
   // Used to tell the PriorityThreadPool It should consider additional threads because a
   // queue full event has happened and a thread has been blocked.
-  threadpool::PriorityThreadPool* fProcessorPool;
+  boost::shared_ptr<threadpool::PriorityThreadPool> fProcessorPool;
 };
 
 }  // namespace primitiveprocessor