From 878a8ab857761a557027dd64e0e26e6cc0407ea7 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <rnozdrin@mariadb.com>
Date: Thu, 13 Oct 2022 09:47:58 +0000
Subject: [PATCH] Compilation error fixes for the recent updates in container
 images

---
 primitives/linux-port/column.cpp | 4 ++--
 utils/rwlock/rwlock.h            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/primitives/linux-port/column.cpp b/primitives/linux-port/column.cpp
index dbcc63ab2..83e93fcb7 100644
--- a/primitives/linux-port/column.cpp
+++ b/primitives/linux-port/column.cpp
@@ -58,7 +58,7 @@ namespace
 template <ENUM_KIND KIND, typename VT, typename T>
 inline typename VT::MaskType getNonEmptyMaskAux(typename VT::MaskType* nonEmptyMaskAux, uint16_t iter)
 {
-  VT proc;
+  [[maybe_unused]] VT proc;
   if constexpr (sizeof(T) == sizeof(uint8_t))
   {
     return nonEmptyMaskAux[iter];
@@ -1469,7 +1469,7 @@ void vectorizedFiltering_(NewColRequestHeader* in, ColResultHeader* out, const T
     weightsMin = simdSwapedOrderDataLoad<KIND, VT, SimdWrapperType, T>(typeHolder, simdProcessor, simdMin).v;
     weightsMax = simdSwapedOrderDataLoad<KIND, VT, SimdWrapperType, T>(typeHolder, simdProcessor, simdMax).v;
   }
-  MT* nonEmptyMaskAux;
+  [[maybe_unused]] MT* nonEmptyMaskAux;
 
   if constexpr (IS_AUX_COLUMN)
   {
diff --git a/utils/rwlock/rwlock.h b/utils/rwlock/rwlock.h
index a0beaf572..f5be4e170 100644
--- a/utils/rwlock/rwlock.h
+++ b/utils/rwlock/rwlock.h
@@ -45,9 +45,9 @@
 
 namespace rwlock
 {
-const std::array<const std::string, 7> RWLockNames = {
+const std::array<const std::string, 7> RWLockNames = {{
     "all", "VSS", "ExtentMap", "FreeList", "VBBM", "CopyLocks", "ExtentMapIndex",
-};
+}};
 
 /// the layout of the shmseg
 struct State