From cd626ac8a037355e15c84469313fe266ac3e2710 Mon Sep 17 00:00:00 2001
From: Leonid Fedorov <79837786+mariadb-LeonidFedorov@users.noreply.github.com>
Date: Tue, 30 Jul 2024 16:40:49 +0400
Subject: [PATCH] fix(): MCOL-5587: revert quick mode due the interactive
 console bug (#3255)

---
 dbcon/mysql/columnstore.cnf                                   | 3 ---
 .../columnstore/bugfixes/MCOL-5587-quick-is-default.result    | 1 -
 .../columnstore/bugfixes/MCOL-5587-quick-is-default.test      | 4 ----
 oam/install_scripts/CMakeLists.txt                            | 2 +-
 4 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result
 delete mode 100644 mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test

diff --git a/dbcon/mysql/columnstore.cnf b/dbcon/mysql/columnstore.cnf
index c8ff4172e..5bfde0bfd 100644
--- a/dbcon/mysql/columnstore.cnf
+++ b/dbcon/mysql/columnstore.cnf
@@ -1,6 +1,3 @@
-[mariadb-client]
-quick
-
 [mysqld]
 plugin-load-add=ha_columnstore.so
 
diff --git a/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result
deleted file mode 100644
index c384d9650..000000000
--- a/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.result
+++ /dev/null
@@ -1 +0,0 @@
-"Check that quick mode is enabled"
diff --git a/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test b/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test
deleted file mode 100644
index 1d4ba8ca5..000000000
--- a/mysql-test/columnstore/bugfixes/MCOL-5587-quick-is-default.test
+++ /dev/null
@@ -1,4 +0,0 @@
---echo "Check that quick mode is enabled"
-# the following line will fail the test if quick mode
-# is not enabled in (some) configuration file as default.
-system mariadb --help | grep -q -E "^quick +TRUE\$";
diff --git a/oam/install_scripts/CMakeLists.txt b/oam/install_scripts/CMakeLists.txt
index b0189d3dd..0a5dcd7dc 100644
--- a/oam/install_scripts/CMakeLists.txt
+++ b/oam/install_scripts/CMakeLists.txt
@@ -127,4 +127,4 @@ install(FILES mariadb-columnstore.service
 install(FILES  module DESTINATION ${ENGINE_DATADIR}/local COMPONENT columnstore-engine)
 
 find_package (Python3 COMPONENTS Interpreter REQUIRED)
-add_test(NAME PythonUnitTests COMMAND ${Python3_EXECUTABLE} -m unittest test_mcs-savebrm.py)
+add_test(NAME PythonUnitTests COMMAND ${Python3_EXECUTABLE} -m unittest test_mcs-savebrm.py)
\ No newline at end of file