diff --git a/mysql-test/columnstore/basic/r/MCOL-5572-autoincrement-filtering.result b/mysql-test/columnstore/basic/r/MCOL-5572-autoincrement-filtering.result index f638c9e48..63263c955 100644 --- a/mysql-test/columnstore/basic/r/MCOL-5572-autoincrement-filtering.result +++ b/mysql-test/columnstore/basic/r/MCOL-5572-autoincrement-filtering.result @@ -18,3 +18,4 @@ select tablename, autoincrement, nextvalue from calpontsys.syscolumn where autoi tablename autoincrement nextvalue foo n 1 DROP DATABASE mcol5572; +DROP DATABASE calpontsys; diff --git a/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result b/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result index 288952088..2ce6f1013 100644 --- a/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result +++ b/mysql-test/columnstore/basic/r/mcs13_alter_table_negative.result @@ -58,3 +58,4 @@ a c1 disconnect addconroot1; disconnect addconroot2; DROP DATABASE mcs13_db1; +DROP DATABASE mcs13_db2; 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 8d331cf40..bee2d5a99 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,5 @@ 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 +DROP DATABASE calpontsys; diff --git a/mysql-test/columnstore/basic/t/cal_named_udfs.test b/mysql-test/columnstore/basic/t/cal_named_udfs.test index d097511b8..bd03af5bc 100644 --- a/mysql-test/columnstore/basic/t/cal_named_udfs.test +++ b/mysql-test/columnstore/basic/t/cal_named_udfs.test @@ -24,3 +24,4 @@ select calgetsqlcount(); DROP TABLE t1; DROP DATABASE cal_test_db; +--source ../include/drop_functions.inc diff --git a/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test b/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test index ade63563a..52d08f77c 100644 --- a/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test +++ b/mysql-test/columnstore/basic/t/mcs13_alter_table_negative.test @@ -83,6 +83,7 @@ disconnect addconroot2; --disable_warnings DROP DATABASE mcs13_db1; +DROP DATABASE mcs13_db2; --enable_warnings # diff --git a/mysql-test/columnstore/basic/t/mcs98_moda_function.test b/mysql-test/columnstore/basic/t/mcs98_moda_function.test index 148f355b4..9b02a79a2 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 84859b2c6..00ca03aa5 100644 --- a/mysql-test/columnstore/basic/t/mcs_named_udfs.test +++ b/mysql-test/columnstore/basic/t/mcs_named_udfs.test @@ -25,3 +25,4 @@ 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 99c91b68d..0edfd7823 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,3 +103,4 @@ 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-4741-strings-ranges-are-unsigned.result b/mysql-test/columnstore/bugfixes/mcol-4741-strings-ranges-are-unsigned.result index c9e2db639..b3dcfdb62 100644 --- a/mysql-test/columnstore/bugfixes/mcol-4741-strings-ranges-are-unsigned.result +++ b/mysql-test/columnstore/bugfixes/mcol-4741-strings-ranges-are-unsigned.result @@ -10,3 +10,4 @@ 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; diff --git a/mysql-test/columnstore/bugfixes/mcol-4741-strings-ranges-are-unsigned.test b/mysql-test/columnstore/bugfixes/mcol-4741-strings-ranges-are-unsigned.test index 31311d992..a3d2222a9 100644 --- a/mysql-test/columnstore/bugfixes/mcol-4741-strings-ranges-are-unsigned.test +++ b/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; diff --git a/mysql-test/columnstore/bugfixes/mcol-5074.result b/mysql-test/columnstore/bugfixes/mcol-5074.result index 772bf7a21..87c51361d 100644 --- a/mysql-test/columnstore/bugfixes/mcol-5074.result +++ b/mysql-test/columnstore/bugfixes/mcol-5074.result @@ -32,3 +32,4 @@ Partner 5 2021-12-11 2 NULL NULL NULL Person Focal Group 4 2021-12-11 NULL NULL NULL 4 PFG 4 2021-12-11 NULL NULL NULL NULL Retail 4 2021-12-12 NULL 1 NULL NULL +DROP DATABASE mcol_5074_db; diff --git a/mysql-test/columnstore/bugfixes/mcol-5074.test b/mysql-test/columnstore/bugfixes/mcol-5074.test index aed1ff750..949210734 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-5669.result b/mysql-test/columnstore/bugfixes/mcol-5669.result index 661bd51c2..bb99111c4 100644 --- a/mysql-test/columnstore/bugfixes/mcol-5669.result +++ b/mysql-test/columnstore/bugfixes/mcol-5669.result @@ -111,3 +111,4 @@ di_source_id brand_sku_id adjusted_dtm is_sit sit_uom sales_uom_daily_average 5304 1004 2024-01-01 1 0.2434 0.00000000 5389 1004 2024-01-01 1 0.2074 0.00000000 DROP DATABASE mcol_5669; +REVOKE ALL PRIVILEGES ON *.* FROM 'cejuser'@'localhost'; diff --git a/mysql-test/columnstore/bugfixes/mcol-5669.test b/mysql-test/columnstore/bugfixes/mcol-5669.test index 70f1b21d5..1506e0a34 100644 --- a/mysql-test/columnstore/bugfixes/mcol-5669.test +++ b/mysql-test/columnstore/bugfixes/mcol-5669.test @@ -110,3 +110,4 @@ INSERT INTO `zzz_999999` VALUES ('2023-12-18',5298,684963,1004,1,1,2166,1.000),( ) as z; DROP DATABASE mcol_5669; +REVOKE ALL PRIVILEGES ON *.* FROM 'cejuser'@'localhost'; diff --git a/mysql-test/columnstore/bugfixes/mcol_4465.test b/mysql-test/columnstore/bugfixes/mcol_4465.test index 25503f6d5..6339eced9 100644 --- a/mysql-test/columnstore/bugfixes/mcol_4465.test +++ b/mysql-test/columnstore/bugfixes/mcol_4465.test @@ -10,3 +10,4 @@ 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 new file mode 100644 index 000000000..a55af261c --- /dev/null +++ b/mysql-test/columnstore/include/drop_functions.inc @@ -0,0 +1,63 @@ +--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