diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt
index 261315583d2..63d9d3b7a6a 100644
--- a/storage/columnstore/CMakeLists.txt
+++ b/storage/columnstore/CMakeLists.txt
@@ -15,7 +15,6 @@ IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR
 CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR
 CMAKE_SYSTEM_PROCESSOR STREQUAL "i386" OR
 CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCOLUMNSTORE_MATURITY=MariaDB_PLUGIN_MATURITY_BETA")
     add_subdirectory(columnstore)
 
     IF(TARGET columnstore)
diff --git a/storage/columnstore/columnstore b/storage/columnstore/columnstore
index bca0d90d553..b6b02ed516f 160000
--- a/storage/columnstore/columnstore
+++ b/storage/columnstore/columnstore
@@ -1 +1 @@
-Subproject commit bca0d90d5537050951a6c2282411d955569a8c58
+Subproject commit b6b02ed516f92055127d416370799d91a82754ea