From 72753308cd6452064517da3609ee86cf0b051a7c Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Tue, 24 Jun 2025 10:57:08 +0300 Subject: [PATCH] Revert "add cleanups to MTR" This reverts commit 9dafef641a785507d447d3dbce81e8ba5a60a1f0. --- .../t/MCOL-5572-autoincrement-filtering.test | 2 +- .../columnstore/basic/t/cal_named_udfs.test | 1 - .../basic/t/mcs98_moda_function.test | 2 +- .../columnstore/basic/t/mcs_named_udfs.test | 1 - ...OL-5776-GROUP-BY-HAVING-functions-use.test | 1 - .../columnstore/bugfixes/mcol-5074.test | 1 + .../columnstore/bugfixes/mcol_4465.test | 1 - .../columnstore/include/drop_functions.inc | 63 ------------------- 8 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 mysql-test/columnstore/include/drop_functions.inc diff --git a/mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test b/mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test index aef1b6f75..8d331cf40 100644 --- a/mysql-test/columnstore/basic/t/MCOL-5572-autoincrement-filtering.test +++ b/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 + diff --git a/mysql-test/columnstore/basic/t/cal_named_udfs.test b/mysql-test/columnstore/basic/t/cal_named_udfs.test index bd03af5bc..d097511b8 100644 --- a/mysql-test/columnstore/basic/t/cal_named_udfs.test +++ b/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 diff --git a/mysql-test/columnstore/basic/t/mcs98_moda_function.test b/mysql-test/columnstore/basic/t/mcs98_moda_function.test index 9b02a79a2..148f355b4 100644 --- a/mysql-test/columnstore/basic/t/mcs98_moda_function.test +++ b/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 + diff --git a/mysql-test/columnstore/basic/t/mcs_named_udfs.test b/mysql-test/columnstore/basic/t/mcs_named_udfs.test index 00ca03aa5..84859b2c6 100644 --- a/mysql-test/columnstore/basic/t/mcs_named_udfs.test +++ b/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 diff --git a/mysql-test/columnstore/bugfixes/MCOL-5776-GROUP-BY-HAVING-functions-use.test b/mysql-test/columnstore/bugfixes/MCOL-5776-GROUP-BY-HAVING-functions-use.test index 0edfd7823..99c91b68d 100644 --- a/mysql-test/columnstore/bugfixes/MCOL-5776-GROUP-BY-HAVING-functions-use.test +++ b/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 diff --git a/mysql-test/columnstore/bugfixes/mcol-5074.test b/mysql-test/columnstore/bugfixes/mcol-5074.test index 6c4978590..9ec6e6535 100644 --- a/mysql-test/columnstore/bugfixes/mcol-5074.test +++ b/mysql-test/columnstore/bugfixes/mcol-5074.test @@ -40,4 +40,5 @@ 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; diff --git a/mysql-test/columnstore/bugfixes/mcol_4465.test b/mysql-test/columnstore/bugfixes/mcol_4465.test index 6339eced9..25503f6d5 100644 --- a/mysql-test/columnstore/bugfixes/mcol_4465.test +++ b/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 diff --git a/mysql-test/columnstore/include/drop_functions.inc b/mysql-test/columnstore/include/drop_functions.inc deleted file mode 100644 index a55af261c..000000000 --- a/mysql-test/columnstore/include/drop_functions.inc +++ /dev/null @@ -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