Revert "add cleanups to MTR"

This reverts commit 9dafef641a.

mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test

@@ -21,4 +21,4 @@ select tablename, autoincrement, nextvalue from calpontsys.syscolumn where autoi
 select tablename, autoincrement, nextvalue from calpontsys.syscolumn where autoincrement = 'n' and `schema`='mcol5572' and tablename='foo';
 
 DROP DATABASE mcol5572;
---source ../include/drop_functions.inc
+

mysql-test/columnstore/basic/t/cal_named_udfs.test

@@ -24,4 +24,3 @@ select calgetsqlcount();
 
 DROP TABLE t1;
 DROP DATABASE cal_test_db;
---source ../include/drop_functions.inc

mysql-test/columnstore/basic/t/mcs98_moda_function.test

@@ -101,4 +101,4 @@ SELECT moda(floor(rl)) FROM t2;
 SELECT t, moda(tu) 'q1' FROM t2 GROUP BY t HAVING moda(tu) > 5;
 # Clean UP
 DROP DATABASE mcs98_db;
---source ../include/drop_functions.inc
+

mysql-test/columnstore/basic/t/mcs_named_udfs.test

@@ -25,4 +25,3 @@ select mcslastinsertid("t1");
 
 DROP TABLE t1;
 DROP DATABASE cal_test_db;
---source ../include/drop_functions.inc

mysql-test/columnstore/bugfixes/MCOL-5776-GROUP-BY-HAVING-functions-use.test

@@ -103,4 +103,3 @@ INSERT INTO t(k) VALUES (1), (2), (2), (3), (3), (4), (4),(4),(4),(4),(995), (NU
 SELECT k + k a FROM t GROUP BY a HAVING a >= 8;
 
 DROP DATABASE MCOL5776;
---source ../include/drop_functions.inc

mysql-test/columnstore/bugfixes/mcol-4741-strings-ranges-are-unsigned.result

@@ -10,4 +10,3 @@ LOAD DATA LOCAL infile 'MTR_SUITE_DIR/../std_data/mcol-4741-part-2-empty-strings
 SELECT COUNT(*) FROM t WHERE x='val';
 COUNT(*)
 2
-DROP DATABASE db4741;

mysql-test/columnstore/bugfixes/mcol-4741-strings-ranges-are-unsigned.test

@@ -16,4 +16,4 @@ SELECT COUNT(*) FROM t WHERE x='val';
 --eval LOAD DATA LOCAL infile '$MTR_SUITE_DIR/../std_data/mcol-4741-part-2-empty-strings.txt' INTO TABLE t
 
 SELECT COUNT(*) FROM t WHERE x='val';
-DROP DATABASE db4741;
+

mysql-test/columnstore/bugfixes/mcol-5074.test

@@ -40,5 +40,4 @@ select
   case when da.mtn in ('PFG','Person Focal Group') then count( acct_id) end +
     case when da.mtn = 'Person Focal Group' then count( acct_id) end as PFG_active_accounts
   from accnt da group by mtn, accts, act_created_dt order by mtn;
-  DROP DATABASE mcol_5074_db;
 

mysql-test/columnstore/bugfixes/mcol-5669.test

@@ -112,5 +112,3 @@ INSERT INTO `zzz_999999` VALUES ('2023-12-18',5298,684963,1004,1,1,2166,1.000),(
 DROP DATABASE mcol_5669;
 REVOKE ALL PRIVILEGES ON *.* FROM 'cejuser'@'localhost';
 DROP USER 'cejuser'@'localhost';
-
-

mysql-test/columnstore/bugfixes/mcol_4465.test

@@ -10,4 +10,3 @@ INSERT INTO cs1 VALUES('i',0),('i',0),('ii',0);
 SELECT c,regr_count(d,length(c)) f FROM cs1 GROUP BY 1 ORDER BY 1;
 SELECT * FROM (SELECT c,regr_count(d,length(c)) f FROM cs1 GROUP BY 1 ORDER BY 1)a;
 DROP DATABASE mcol_4465;
---source ../include/drop_functions.inc

mysql-test/columnstore/include/drop_functions.inc

@@ -1,63 +0,0 @@
---disable_query_log
-DROP FUNCTION mcsgetstats;
-DROP FUNCTION calgetstats;
-DROP FUNCTION mcssettrace;
-DROP FUNCTION calsettrace;
-DROP FUNCTION mcssetparms;
-DROP FUNCTION calsetparms;
-DROP FUNCTION mcsflushcache;
-DROP FUNCTION calflushcache;
-DROP FUNCTION mcsgettrace;
-DROP FUNCTION calgettrace;
-DROP FUNCTION mcsgetversion;
-DROP FUNCTION calgetversion;
-DROP FUNCTION calonlinealter;
-DROP FUNCTION mcsviewtablelock;
-DROP FUNCTION calviewtablelock;
-DROP FUNCTION mcscleartablelock;
-DROP FUNCTION calcleartablelock;
-DROP FUNCTION mcslastinsertid;
-DROP FUNCTION callastinsertid;
-DROP FUNCTION mcsgetsqlcount;
-DROP FUNCTION calgetsqlcount;
-DROP FUNCTION idbpm;
-DROP FUNCTION idbdbroot;
-DROP FUNCTION idbsegment;
-DROP FUNCTION idbsegmentdir;
-DROP FUNCTION idbextentrelativerid;
-DROP FUNCTION idbblockid;
-DROP FUNCTION idbextentid;
-DROP FUNCTION idbextentmin;
-DROP FUNCTION idbextentmax;
-DROP FUNCTION idbpartition;
-DROP FUNCTION idblocalpm;
-DROP FUNCTION mcssystemready;
-DROP FUNCTION mcssystemreadonly;
-DROP FUNCTION mcssystemprimary;
-DROP FUNCTION mcs_emindex_size;
-DROP FUNCTION mcs_emindex_free;
-DROP FUNCTION columnstore_dataload;
-DROP FUNCTION regr_avgx;
-DROP FUNCTION regr_avgy;
-DROP FUNCTION regr_count;
-DROP FUNCTION regr_slope;
-DROP FUNCTION regr_intercept;
-DROP FUNCTION regr_r2;
-DROP FUNCTION corr;
-DROP FUNCTION regr_sxx;
-DROP FUNCTION regr_syy;
-DROP FUNCTION regr_sxy;
-DROP FUNCTION covar_pop;
-DROP FUNCTION covar_samp;
-DROP FUNCTION distinct_count;
-DROP FUNCTION caldisablepartitions;
-DROP FUNCTION calenablepartitions;
-DROP FUNCTION caldroppartitions;
-DROP FUNCTION calshowpartitions;
-DROP FUNCTION caldroppartitionsbyvalue;
-DROP FUNCTION caldisablepartitionsbyvalue;
-DROP FUNCTION calenablepartitionsbyvalue;
-DROP FUNCTION calshowpartitionsbyvalue;
-DROP FUNCTION moda;
-DROP FUNCTION mcs_set_ddldebug_level;
---enable_query_log