diff --git a/mysql-test/columnstore/basic/t/mcol641-delete.test b/mysql-test/columnstore/basic/t/mcol641-delete.test
index 388a562aa..5ee0d9f40 100644
--- a/mysql-test/columnstore/basic/t/mcol641-delete.test
+++ b/mysql-test/columnstore/basic/t/mcol641-delete.test
@@ -334,4 +334,5 @@ DROP PROCEDURE IF EXISTS signeddeleteproc;
 DROP PROCEDURE IF EXISTS unsignedinsertproc;
 DROP PROCEDURE IF EXISTS unsigneddeleteproc;
 DROP DATABASE mcol641_delete_db;
---enable_warnings
\ No newline at end of file
+--enable_warnings
+
diff --git a/mysql-test/columnstore/devregression/t/mcs7035_regression_bug2976.test b/mysql-test/columnstore/devregression/t/mcs7035_regression_bug2976.test
index 0e07c5492..374cf09b2 100644
--- a/mysql-test/columnstore/devregression/t/mcs7035_regression_bug2976.test
+++ b/mysql-test/columnstore/devregression/t/mcs7035_regression_bug2976.test
@@ -8,14 +8,15 @@
 #
 USE tpch1;
 #
-/*
-* Bug 2976.  Lost connection with from clause subselect against MyISAM tables in an InfiniDB instance.
-*/
+#
+# Bug 2976.  Lost connection with from clause subselect against MyISAM tables in an InfiniDB instance.
+#
 
 --disable_warnings
 drop table if exists a;
---disable_warnings
 drop table if exists b;
+--enable_warnings
+
 create table a (c1 int)engine=myisam;
 create table b (c2 int)engine=myisam;
 insert into a values (1), (2);
@@ -25,9 +26,10 @@ select * from a, (select * from b) x;
 drop table a; 
 drop table b;
 --enable_warnings
-/*
-* Skinit example. 
-*/
+
+#
+# Skinit example. 
+#
 --disable_warnings
 drop table if exists shipamounts;
 drop table if exists ship1;
@@ -105,9 +107,9 @@ drop table if exists shipamounts;
 drop table if exists ship1;
 drop table if exists ship2;
 --enable_warnings
-/*
-* Lurn India example.
-*/
+#
+# Lurn India example.
+#
 --disable_warnings
 drop table if exists users;
 drop table if exists user_login_log;
diff --git a/mysql-test/columnstore/devregression/t/mcs7151_regression_bug4431.test b/mysql-test/columnstore/devregression/t/mcs7151_regression_bug4431.test
index a675de490..3edfc8da1 100644
--- a/mysql-test/columnstore/devregression/t/mcs7151_regression_bug4431.test
+++ b/mysql-test/columnstore/devregression/t/mcs7151_regression_bug4431.test
@@ -18,8 +18,7 @@ create table bug4431_1 (date int, col2 date) engine=columnstore;
 create table bug4431_2 (`date` int, col2 date) engine=columnstore;
 create table bug4431_3 (col2 date) engine=columnstore;
 alter table bug4431_3 add column date int;
-alter table bug4431_3 --disable_warnings
-drop column date;
+alter table bug4431_3 drop column date;
 
 insert into bug4431_1 values (1, '2012-06-06'),(2, '2012-06-06'),(3, '2012-06-06'),(4, '2012-06-06');
 select * from bug4431_1;
diff --git a/mysql-test/columnstore/devregression/t/mcs7228_regression_MCOL-3813.test b/mysql-test/columnstore/devregression/t/mcs7228_regression_MCOL-3813.test
index a377df9c9..59993fb9b 100644
--- a/mysql-test/columnstore/devregression/t/mcs7228_regression_MCOL-3813.test
+++ b/mysql-test/columnstore/devregression/t/mcs7228_regression_MCOL-3813.test
@@ -10,9 +10,9 @@ USE tpch1;
 #
 
 
-/* FROM MCOL-1349 
-   Note: Adding this because code that directly involved this bug was modified
-   Other regression involved is working_tpch1_compareLogOnly/misc/bug5764.sql*/
+# FROM MCOL-1349 
+#   Note: Adding this because code that directly involved this bug was modified
+#   Other regression involved is working_tpch1_compareLogOnly/misc/bug5764.sql*/
 
 --disable_warnings
 drop table if exists t3813_1;
@@ -45,27 +45,27 @@ insert into t3813_1(id) values(1);
 insert into t3813_2(id2, snapshot_date) values(1,'2020-05-09');
 insert into t3813_3(id3, from_date, to_date) values(1,'2020-05-09'-interval 1 day, '2020-05-09'+interval 2 day);
 insert into t3813_4(id4, category) values(1, 'cat-1');
-/*PREPARATION END*/
+#/*PREPARATION END*/
 
-/*THE PROBLEM: The SELECT itself below runs properly, but calling it from view the 1815 error is thrown*/
+#/*THE PROBLEM: The SELECT itself below runs properly, but calling it from view the 1815 error is thrown*/
 select * from t3813_1 t3813_1
 LEFT JOIN t3813_4 t3813_4 ON (t3813_1.id = t3813_4.id4) 
 LEFT JOIN t3813_2 t3813_2 ON (t3813_1.id = t3813_2.id2) 
 LEFT JOIN t3813_3 t3813_3 ON (t3813_2.id2 = t3813_3.id3 AND t3813_2.snapshot_date BETWEEN t3813_3.from_date AND t3813_3.to_date);
 
-/*Creating VIEW based on the SELECT above*/
+#/*Creating VIEW based on the SELECT above*/
 create or replace view view_test as
 select * from t3813_1 t3813_1
 LEFT JOIN t3813_4 t3813_4 ON (t3813_1.id = t3813_4.id4)
 LEFT JOIN t3813_2 t3813_2 ON (t3813_1.id = t3813_2.id2) 
 LEFT JOIN t3813_3 t3813_3 ON (t3813_2.id2 = t3813_3.id3 AND t3813_2.snapshot_date BETWEEN t3813_3.from_date AND t3813_3.to_date);
 
-/*SELECT from the VIEW throws the error: Error Code: 1815. Internal error: On clause filter involving a table not directly involved in the outer join is currently not supported.*/
+#/*SELECT from the VIEW throws the error: Error Code: 1815. Internal error: On clause filter involving a table not directly involved in the outer join is currently not supported.*/
 select * from view_test;
 
-/*Notes*/
-/*If I remove either the 1st or the 3rd LEFT JOINs from the VIEW definition, the SELECT * from VIEW will work. (I cannot remove the 2nd LEFT JOIN since the 3rd is based on that one)*/
-/*Replacing COLUMNSTORE engine to INNODB the view the SELECT * from VIEW will work, but if one of the tables is COLUMNSTORE the error will thrown*/
+#/*Notes*/
+#/*If I remove either the 1st or the 3rd LEFT JOINs from the VIEW definition, the SELECT * from VIEW will work. (I cannot remove the 2nd LEFT JOIN since the 3rd is based on that one)*/
+#/*Replacing COLUMNSTORE engine to INNODB the view the SELECT * from VIEW will work, but if one of the tables is COLUMNSTORE the error will thrown*/
 --disable_warnings
 drop table if exists t3813_1;
 drop table if exists t3813_2;
diff --git a/mysql-test/columnstore/devregression/t/mcs7247_regression_bug3038b.test b/mysql-test/columnstore/devregression/t/mcs7247_regression_bug3038b.test
index b1e9270d5..993cf999e 100644
--- a/mysql-test/columnstore/devregression/t/mcs7247_regression_bug3038b.test
+++ b/mysql-test/columnstore/devregression/t/mcs7247_regression_bug3038b.test
@@ -8,9 +8,9 @@
 #
 USE tpch1;
 #
-/* Test case from Radek at CognitiveMatch - customer who bought based on us adding the multi-value in clause feature. */
+#/* Test case from Radek at CognitiveMatch - customer who bought based on us adding the multi-value in clause feature. */
 
-/* First test using IDB tables. */
+#/* First test using IDB tables. */
 --disable_warnings
 drop table if exists agg_fact_pageview;
 drop table if exists dim_date;
diff --git a/mysql-test/columnstore/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test b/mysql-test/columnstore/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test
index 54c7bca83..c7418bca0 100644
--- a/mysql-test/columnstore/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test
+++ b/mysql-test/columnstore/devregression/t/mcs7522_storedProcedures_sp_autoswitch.test
@@ -11,9 +11,7 @@ USE tpch1;
 
 # Simple SP without args
 DELIMITER $$;
---disable_warnings
 drop procedure if exists sp_simple_select;
---enable_warnings
 
 Create Procedure sp_simple_select( )
 begin
@@ -21,9 +19,7 @@ begin
 end $$
 
 # Simple SP with 1 arg
---disable_warnings
 drop procedure if exists sp_simple_variable;
---enable_warnings
 
 Create Procedure sp_simple_variable(in arg_key int)
 begin
@@ -31,9 +27,7 @@ begin
 end $$
 
 # Simple SP with multiple args
---disable_warnings
 drop procedure if exists sp_simple_variables;
---enable_warnings
 
 Create Procedure sp_simple_variables(in arg_key int, in arg_string varchar(25))
 begin
@@ -41,9 +35,7 @@ begin
 end $$
 
 # Simple SP with cross table select query
---disable_warnings
 drop procedure if exists sp_complex_variable;
---enable_warnings
 
 Create Procedure sp_complex_variable(in arg_key int, in arg_date date)
 begin
@@ -52,9 +44,7 @@ begin
 end $$
 
 # Complex SP. All following SPs will fail vtable mode
---disable_warnings
 drop procedure if exists sp_unstructured_loop;
---enable_warnings
 
 Create Procedure sp_unstructured_loop(in arg_key int)
 begin
@@ -82,9 +72,7 @@ begin
 end$$
 
 
---disable_warnings
 drop procedure if exists sp_repeat_loop;
---enable_warnings
 
 Create Procedure sp_repeat_loop(in arg_key int, in arg_key2 int)
 begin
@@ -114,9 +102,7 @@ begin
     CLOSE cur1;
 end$$
 
---disable_warnings
 drop procedure if exists sp_while_loop;
---enable_warnings
 
 Create Procedure sp_while_loop(in arg_key int, in arg_key2 int)
 begin
@@ -146,9 +132,7 @@ begin
 end$$
 
 # SP with DDL
---disable_warnings
 drop procedure if exists proc1;
---enable_warnings
 
 create procedure proc1()
 begin
diff --git a/mysql-test/columnstore/devregression/t/mcs7523_partitionOptimization_aCreateViews.test b/mysql-test/columnstore/devregression/t/mcs7523_partitionOptimization_aCreateViews.test
index 111de6586..a362a0932 100644
--- a/mysql-test/columnstore/devregression/t/mcs7523_partitionOptimization_aCreateViews.test
+++ b/mysql-test/columnstore/devregression/t/mcs7523_partitionOptimization_aCreateViews.test
@@ -174,5 +174,6 @@ drop procedure if exists partsuppColumnsTouched;
 drop procedure if exists regionColumnsTouched;
 drop procedure if exists nationColumnsTouched;
 drop procedure if exists eliminatedBlocksGE;
+--enable_warnings
 #