diff --git a/mysql-test/columnstore/1pmonly/t/mcs4009_autopilot_partition_management.test b/mysql-test/columnstore/1pmonly/t/mcs4009_autopilot_partition_management.test index 074cd1e1b..2863ef856 100755 --- a/mysql-test/columnstore/1pmonly/t/mcs4009_autopilot_partition_management.test +++ b/mysql-test/columnstore/1pmonly/t/mcs4009_autopilot_partition_management.test @@ -5,6 +5,7 @@ # -------------------------------------------------------------- # --source ../include/have_columnstore.inc --source ../include/detect_maxscale.inc +--source ../include/functions.inc # --disable_warnings DROP DATABASE IF EXISTS mcs4009_db; @@ -60,3 +61,4 @@ select calshowpartitions('lineitem','l_orderkey'); # -------------------------------------------------------------- # # DROP DATABASE mcs4009_db; +--source ../include/drop_functions.inc diff --git a/mysql-test/columnstore/autopilot/t/mcs6197_windowFunctions_REGR_AVGX.test b/mysql-test/columnstore/autopilot/t/mcs6197_windowFunctions_REGR_AVGX.test index f7f52f9ec..3706fe973 100644 --- a/mysql-test/columnstore/autopilot/t/mcs6197_windowFunctions_REGR_AVGX.test +++ b/mysql-test/columnstore/autopilot/t/mcs6197_windowFunctions_REGR_AVGX.test @@ -5,6 +5,7 @@ # -------------------------------------------------------------- # # --source ../include/have_columnstore.inc +--source ../include/functions.inc # use tpch1m; # @@ -256,3 +257,4 @@ select o_custkey, REGR_AVGX(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custk select o_custkey, REGR_AVGX(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custkey)+2 ORDER BY o_custkey ,o_orderkey ,o_orderdate ROWS BETWEEN 15 PRECEDING AND 15 PRECEDING) from (select * from orders where o_custkey <= 20000) s order by 1, 2; select o_custkey, REGR_AVGX(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custkey)+2 ORDER BY o_custkey ,o_orderkey ,o_orderdate ROWS BETWEEN 15 PRECEDING AND 15 FOLLOWING) from (select * from orders where o_custkey <= 20000) s order by 1, 2; select o_custkey, REGR_AVGX(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custkey)+2 ORDER BY o_custkey ,o_orderkey ,o_orderdate ROWS BETWEEN 15 FOLLOWING AND 15 FOLLOWING) from (select * from orders where o_custkey <= 20000) s order by 1, 2; +--source ../include/drop_functions.inc diff --git a/mysql-test/columnstore/autopilot/t/mcs6198_windowFunctions_REGR_AVGY.test b/mysql-test/columnstore/autopilot/t/mcs6198_windowFunctions_REGR_AVGY.test index 74173983f..aaa216a3c 100644 --- a/mysql-test/columnstore/autopilot/t/mcs6198_windowFunctions_REGR_AVGY.test +++ b/mysql-test/columnstore/autopilot/t/mcs6198_windowFunctions_REGR_AVGY.test @@ -5,6 +5,7 @@ # -------------------------------------------------------------- # # --source ../include/have_columnstore.inc +--source ../include/functions.inc # use tpch1m; # @@ -256,3 +257,4 @@ select o_custkey, REGR_AVGY(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custk select o_custkey, REGR_AVGY(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custkey)+2 ORDER BY o_custkey ,o_orderkey ,o_orderdate ROWS BETWEEN 15 PRECEDING AND 15 PRECEDING) from (select * from orders where o_custkey <= 20000) s order by 1, 2; select o_custkey, REGR_AVGY(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custkey)+2 ORDER BY o_custkey ,o_orderkey ,o_orderdate ROWS BETWEEN 15 PRECEDING AND 15 FOLLOWING) from (select * from orders where o_custkey <= 20000) s order by 1, 2; select o_custkey, REGR_AVGY(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custkey)+2 ORDER BY o_custkey ,o_orderkey ,o_orderdate ROWS BETWEEN 15 FOLLOWING AND 15 FOLLOWING) from (select * from orders where o_custkey <= 20000) s order by 1, 2; +--source ../include/drop_functions.inc diff --git a/mysql-test/columnstore/autopilot/t/mcs6199_windowFunctions_REGR_COUNT.test b/mysql-test/columnstore/autopilot/t/mcs6199_windowFunctions_REGR_COUNT.test index 7c36d2496..e2da024ed 100644 --- a/mysql-test/columnstore/autopilot/t/mcs6199_windowFunctions_REGR_COUNT.test +++ b/mysql-test/columnstore/autopilot/t/mcs6199_windowFunctions_REGR_COUNT.test @@ -5,6 +5,7 @@ # -------------------------------------------------------------- # # --source ../include/have_columnstore.inc +--source ../include/functions.inc # use tpch1m; # @@ -256,3 +257,4 @@ select o_custkey, REGR_COUNT(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_cust select o_custkey, REGR_COUNT(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custkey)+2 ORDER BY o_custkey ,o_orderkey ,o_orderdate ROWS BETWEEN 15 PRECEDING AND 15 PRECEDING) from (select * from orders where o_custkey <= 20000) s order by 1, 2; select o_custkey, REGR_COUNT(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custkey)+2 ORDER BY o_custkey ,o_orderkey ,o_orderdate ROWS BETWEEN 15 PRECEDING AND 15 FOLLOWING) from (select * from orders where o_custkey <= 20000) s order by 1, 2; select o_custkey, REGR_COUNT(o_custkey,o_orderkey) OVER (PARTITION BY abs(o_custkey)+2 ORDER BY o_custkey ,o_orderkey ,o_orderdate ROWS BETWEEN 15 FOLLOWING AND 15 FOLLOWING) from (select * from orders where o_custkey <= 20000) s order by 1, 2; +--source ../include/drop_functions.inc diff --git a/mysql-test/columnstore/devregression/t/mcs7064_regression_bug3283.test b/mysql-test/columnstore/devregression/t/mcs7064_regression_bug3283.test index de8dcb488..f5197a3d4 100644 --- a/mysql-test/columnstore/devregression/t/mcs7064_regression_bug3283.test +++ b/mysql-test/columnstore/devregression/t/mcs7064_regression_bug3283.test @@ -5,12 +5,13 @@ # -------------------------------------------------------------- # # --source ../include/have_columnstore.inc +--source ../include/functions.inc # USE tpch1; # # Negative test case for attempting to drop a non-existent partition. select caldroppartitions('lineitem', '4.1.1'); select caldisablepartitions('lineitem', '4.1.1'); - +--source ../include/drop_functions.inc # diff --git a/mysql-test/columnstore/devregression/t/mcs7139_regression_bug4074.test b/mysql-test/columnstore/devregression/t/mcs7139_regression_bug4074.test index 817d6637a..89fb8b5a1 100644 --- a/mysql-test/columnstore/devregression/t/mcs7139_regression_bug4074.test +++ b/mysql-test/columnstore/devregression/t/mcs7139_regression_bug4074.test @@ -6,6 +6,7 @@ # --source ../include/have_columnstore.inc --source ../include/detect_maxscale.inc +--source ../include/functions.inc # USE tpch1; # @@ -36,4 +37,5 @@ select 'q6', birthdate, age, id, col8 from bug3657 where col8=2; --disable_warnings drop table if exists bug3657; --enable_warnings +--source ../include/drop_functions.inc # diff --git a/mysql-test/columnstore/devregression/t/mcs7224_regression_MCOL-3503.test b/mysql-test/columnstore/devregression/t/mcs7224_regression_MCOL-3503.test index 3d31bbfd6..6f5cba866 100644 --- a/mysql-test/columnstore/devregression/t/mcs7224_regression_MCOL-3503.test +++ b/mysql-test/columnstore/devregression/t/mcs7224_regression_MCOL-3503.test @@ -5,10 +5,11 @@ # -------------------------------------------------------------- # # --source ../include/have_columnstore.inc +--source ../include/functions.inc # USE tpch1; # select depname, empno, moda(salary) over(partition by depname order by enroll_date) from empsalary order by depname, empno, enroll_date; select avg(salary),depname, moda(salary) over(partition by depname order by enroll_date) from empsalary group by depname order by depname, avg(salary); # - +--source ../include/drop_functions.inc diff --git a/mysql-test/columnstore/devregression/t/mcs7257_regression_mcol1642.test b/mysql-test/columnstore/devregression/t/mcs7257_regression_mcol1642.test index 43ac8bb06..88c60f04f 100644 --- a/mysql-test/columnstore/devregression/t/mcs7257_regression_mcol1642.test +++ b/mysql-test/columnstore/devregression/t/mcs7257_regression_mcol1642.test @@ -5,9 +5,10 @@ # -------------------------------------------------------------- # # --source ../include/have_columnstore.inc +--source ../include/functions.inc # USE tpch1; # select mcsSystemPrimary() as a; # - +--source ../include/drop_functions.inc