From 4ba64536099dc7da9350f4b40f5639fbb032a04b Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Sun, 21 Jun 2020 11:36:58 +0000
Subject: MCS reduces plugin_maturity down to beta.

---
 storage/columnstore/CMakeLists.txt | 3 ++-
 storage/columnstore/columnstore    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
index 89f88998d40..15ed741972f 100644
--- a/storage/columnstore/CMakeLists.txt
+++ b/storage/columnstore/CMakeLists.txt
@@ -1,6 +1,7 @@
 #set(PLUGIN_COLUMNSTORE "NO" CACHE STRING "Enable ColumnStore engine")
 
-if("NO" STREQUAL "${PLUGIN_COLUMNSTORE}")
+if("NO" STREQUAL "${PLUGIN_COLUMNSTORE}" OR
+    (NOT DEB AND NOT RPM AND NOT "YES" STREQUAL "${PLUGIN_COLUMNSTORE}"))
   return()
 endif()
 
diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore
index aa3af826202..2db8a502889 160000
--- a/storage/columnstore/columnstore
+++ b/storage/columnstore/columnstore
@@ -1 +1 @@
-Subproject commit aa3af8262028262a3c3f877039ef6f073517aa35
+Subproject commit 2db8a5028893eaff986bb34e3730a1ff7bbad276
-- 
cgit v1.2.1