From 87055f42f61b5eefa10e42d01655a55d48f46244 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <vuvova@gmail.com>
Date: Tue, 7 Jul 2020 16:32:52 +0200
Subject: [PATCH] make columnstore to load in enterprise

.cnf file overwriting plugin-maturity must be lexicographically
after mariadb-enterprise.cnf

also set the maturity correctly without relying on supermodule doing it
---
 dbcon/mysql/CMakeLists.txt    | 2 ++
 dbcon/mysql/ha_mcs.cpp        | 2 +-
 dbcon/mysql/x-columnstore.cnf | 3 +++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 dbcon/mysql/x-columnstore.cnf

diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index cbe3bf4ec..bf8316c79 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -65,3 +65,5 @@ install(PROGRAMS install_mcs_mysql.sh
 
 install(FILES columnstore.cnf
     DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
+install(FILES x-columnstore.cnf
+    DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
diff --git a/dbcon/mysql/ha_mcs.cpp b/dbcon/mysql/ha_mcs.cpp
index 44f4fed4e..8bf96b495 100644
--- a/dbcon/mysql/ha_mcs.cpp
+++ b/dbcon/mysql/ha_mcs.cpp
@@ -28,7 +28,7 @@
 #include "ha_mcs_version.h"
 
 #ifndef COLUMNSTORE_MATURITY
-#define COLUMNSTORE_MATURITY MariaDB_PLUGIN_MATURITY_STABLE
+#define COLUMNSTORE_MATURITY MariaDB_PLUGIN_MATURITY_BETA
 #endif
 
 #define CACHE_PREFIX "#cache#"
diff --git a/dbcon/mysql/x-columnstore.cnf b/dbcon/mysql/x-columnstore.cnf
new file mode 100644
index 000000000..f31345ee1
--- /dev/null
+++ b/dbcon/mysql/x-columnstore.cnf
@@ -0,0 +1,3 @@
+# make ha_columnstore.so to load
+[mariadb]
+plugin-maturity=beta