summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Nozdrin <roman.nozdrin@mariadb.com>2020-06-21 11:36:58 +0000
committerRoman Nozdrin <roman.nozdrin@mariadb.com>2020-06-21 11:49:30 +0000
commit4ba64536099dc7da9350f4b40f5639fbb032a04b (patch)
tree3136d9822fd78771f10d30f3592cad5d7acbae83
parent19d09e499120f5f4ce01dc91bbfe104df5f83542 (diff)
downloadmariadb-git-drrtuy-10.5-cs.tar.gz
MCS reduces plugin_maturity down to beta.drrtuy-10.5-cs
-rw-r--r--storage/columnstore/CMakeLists.txt3
m---------storage/columnstore/columnstore0
2 files changed, 2 insertions, 1 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
-Subproject aa3af8262028262a3c3f877039ef6f073517aa3
+Subproject 2db8a5028893eaff986bb34e3730a1ff7bbad27