From b5bc38c4ad60b9293dd0ff8c163abf4c2a45f40f Mon Sep 17 00:00:00 2001
From: David Hall <mcfadden7586@gmail.com>
Date: Mon, 28 Sep 2020 14:35:34 -0500
Subject: [PATCH] MCOL-4329 dev set plugin-maturity to stable Also remove
 x-columnstore.cnf

---
 dbcon/mysql/CMakeLists.txt                      | 17 ++---------------
 dbcon/mysql/columnstore.cnf                     |  1 -
 oam/install_scripts/columnstore-post-install.in |  6 ++++++
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index a2e903698..491a59323 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -40,12 +40,7 @@ if (COMMAND mysql_add_plugin)
   ENDIF()
   
   FILE(COPY columnstore.cnf DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/)
-  if (BUILD_CONFIG STREQUAL "enterprise")
-    FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/x-columnstore.cnf)
-    SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/x-columnstore.cnf")
-  else ()
-    SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf")
-  endif ()
+  SET(CS_CNF_FILE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/columnstore.cnf")
   
   mysql_add_plugin(columnstore ${libcalmysql_SRCS} STORAGE_ENGINE MODULE_ONLY ${disabled}
       LINK_LIBRARIES ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} threadpool
@@ -62,15 +57,7 @@ else ()
     
     # define this dummy target for standalone builds (ie, when mysql_add_plugin doesn't exist)
     add_custom_target(columnstore DEPENDS ha_columnstore) 
-    if(BUILD_CONFIG STREQUAL "enterprise")
-    message(STATUS "enterprise build: columnstore.cnf renamed to x-columnstore.cnf on install")
-        install(FILES columnstore.cnf
-            RENAME x-columnstore.cnf
-            DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
-    else()
-        install(FILES columnstore.cnf
-            DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
-    endif()
+    install(FILES columnstore.cnf DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
 endif ()
 
 if (TARGET columnstore)
diff --git a/dbcon/mysql/columnstore.cnf b/dbcon/mysql/columnstore.cnf
index 19840e129..f8ceed866 100644
--- a/dbcon/mysql/columnstore.cnf
+++ b/dbcon/mysql/columnstore.cnf
@@ -1,6 +1,5 @@
 [mysqld]
 plugin-load-add=ha_columnstore.so
-plugin-maturity=beta
 
 # Enable compression by default on create, set to NONE to turn off
 #columnstore_compression_type=SNAPPY
diff --git a/oam/install_scripts/columnstore-post-install.in b/oam/install_scripts/columnstore-post-install.in
index 930c6a929..48432e55f 100755
--- a/oam/install_scripts/columnstore-post-install.in
+++ b/oam/install_scripts/columnstore-post-install.in
@@ -81,6 +81,12 @@ if [ -z "$(pgrep -x mariadbd)" ];then
 fi
 sleep 2
 
+# One time remove x-columnstore.cnf if it exists.
+# x-columnstore.cnf was a kludge for using when plugin-maturity=gamma
+if [ -f @MARIADB_MYCNFDIR@/x-columnstore.cnf]; then
+    /bin/rm -f @MARIADB_MYCNFDIR@/x-columnstore.cnf
+fi
+
 if [ -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave ]; then
     /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.new
     /bin/cp -f @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf.rpmsave @ENGINE_SYSCONFDIR@/columnstore/storagemanager.cnf