From 26895ccdb36c592bc5b348980c798afbc3673efa Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Mon, 27 Jul 2020 12:04:49 +0000
Subject: [PATCH] Remove x-columnstore.cnf b/c it breaks minor-upgrade on
 RPM-based distros

---
 dbcon/mysql/CMakeLists.txt    | 2 --
 dbcon/mysql/x-columnstore.cnf | 3 ---
 2 files changed, 5 deletions(-)
 delete mode 100644 dbcon/mysql/x-columnstore.cnf

diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt
index 45ab131af..cf5e53f13 100644
--- a/dbcon/mysql/CMakeLists.txt
+++ b/dbcon/mysql/CMakeLists.txt
@@ -68,6 +68,4 @@ if (TARGET columnstore)
 
     install(FILES columnstore.cnf
         DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
-    install(FILES x-columnstore.cnf
-        DESTINATION ${MARIADB_MYCNFDIR} COMPONENT columnstore-engine)
 endif()
diff --git a/dbcon/mysql/x-columnstore.cnf b/dbcon/mysql/x-columnstore.cnf
deleted file mode 100644
index 1fd9620d3..000000000
--- a/dbcon/mysql/x-columnstore.cnf
+++ /dev/null
@@ -1,3 +0,0 @@
-# make ha_columnstore.so to load
-[mariadb]
-plugin-maturity=gamma