diff --git a/mysql-test/columnstore/basic/r/ctype_extent_koi8u.result b/mysql-test/columnstore/basic/r/ctype_extent_koi8u.result index 231c29855..15db8f865 100644 --- a/mysql-test/columnstore/basic/r/ctype_extent_koi8u.result +++ b/mysql-test/columnstore/basic/r/ctype_extent_koi8u.result @@ -1,3 +1,4 @@ +SET GLOBAL log_bin_trust_function_creators = 1; DROP DATABASE IF EXISTS mcs_ctype_extent_koi8u; CREATE DATABASE mcs_ctype_extent_koi8u; USE mcs_ctype_extent_koi8u; diff --git a/mysql-test/columnstore/basic/r/ctype_extent_latin1.result b/mysql-test/columnstore/basic/r/ctype_extent_latin1.result index fb338da26..929635fbe 100644 --- a/mysql-test/columnstore/basic/r/ctype_extent_latin1.result +++ b/mysql-test/columnstore/basic/r/ctype_extent_latin1.result @@ -1,3 +1,4 @@ +SET GLOBAL log_bin_trust_function_creators = 1; DROP DATABASE IF EXISTS mcs_ctype_extent_latin1; CREATE DATABASE mcs_ctype_extent_latin1; USE mcs_ctype_extent_latin1; diff --git a/mysql-test/columnstore/basic/r/ctype_extent_utf8mb3.result b/mysql-test/columnstore/basic/r/ctype_extent_utf8mb3.result index 70d32ffaa..ea28a8331 100644 --- a/mysql-test/columnstore/basic/r/ctype_extent_utf8mb3.result +++ b/mysql-test/columnstore/basic/r/ctype_extent_utf8mb3.result @@ -1,3 +1,4 @@ +SET GLOBAL log_bin_trust_function_creators = 1; DROP DATABASE IF EXISTS mcs_ctype_extent_utf8mb3; CREATE DATABASE mcs_ctype_extent_utf8mb3; USE mcs_ctype_extent_utf8mb3; diff --git a/mysql-test/columnstore/basic/r/mcol3738_count_distinct_multiparm.result b/mysql-test/columnstore/basic/r/mcol3738_count_distinct_multiparm.result index 2c7174513..f9c9856ee 100644 --- a/mysql-test/columnstore/basic/r/mcol3738_count_distinct_multiparm.result +++ b/mysql-test/columnstore/basic/r/mcol3738_count_distinct_multiparm.result @@ -32,32 +32,32 @@ idx count(distinct c1, c2) count(distinct c1, c3, char1) select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1; avg(distinct c2) count(c2) count( distinct c2, c3) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3) 3.0000 12 12 12 9 3.0000 12 -select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1; +select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7; avg(distinct c2) count(c2) count( distinct c2, c3) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3) 3.0000 6 6 6 9 2.0000 6 3.0000 6 6 6 9 3.6667 6 -select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2) from t1 group by c1; +select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7; avg(distinct c2) count(c2) count( distinct c2, c3) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2) 3.0000 6 6 6 9 2.0000 3 3.0000 6 6 6 9 3.6667 3 -select avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1; +select avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7; avg(distinct c2) count(c2) count( distinct c2) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3) 3.0000 6 3 6 9 2.0000 6 3.0000 6 3 6 9 3.6667 6 -select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1; +select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1 order by 1, 2, 3, 4, 5, 6, 7; group_concat(distinct char1) avg(distinct c2) count(c2) count( distinct c2) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3, c1) elsewhere this way comes,something this way comes 3.0000 12 3 12 9 3.0000 12 -select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1; +select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7; group_concat(distinct char1) avg(distinct c2) count(c2) count( distinct c2) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3) elsewhere this way comes,something this way comes 3.0000 6 3 6 9 2.0000 6 elsewhere this way comes,something this way comes 3.0000 6 3 6 9 3.6667 6 -select idx, sum(c3), count(distinct c1, c2), count(distinct c1, c3, char1), group_concat("ls_", char1) from t1 group by idx order by idx; +select idx, sum(c3), count(distinct c1, c2), count(distinct c1, c3, char1), group_concat("ls_", char1) from t1 group by idx order by 1, 2, 3, 4, 5; idx sum(c3) count(distinct c1, c2) count(distinct c1, c3, char1) group_concat("ls_", char1) 1 9 6 4 ls_something this way comes,ls_elsewhere this way comes,ls_something this way comes,ls_something this way comes,ls_elsewhere this way comes,ls_elsewhere this way comes 2 9 3 2 ls_something this way comes,ls_elsewhere this way comes,ls_something this way comes 3 8 2 2 ls_something this way comes,ls_elsewhere this way comes 4 5 1 1 ls_elsewhere this way comes -select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1; +select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1 order by 1, 2, 3, 4, 5, 6, 7; group_concat(distinct char1) avg(distinct c2) count(c2) count( distinct c2) count(c2) sum(distinct c2) avg(distinct c3) count(distinct c2, c3, c1) elsewhere this way comes,something this way comes 3.0000 12 3 12 9 3.0000 12 DROP DATABASE mcol_3738_db; diff --git a/mysql-test/columnstore/basic/r/mcol4766-rollback-ranges.result b/mysql-test/columnstore/basic/r/mcol4766-rollback-ranges.result index 0c161f490..9504b231c 100644 --- a/mysql-test/columnstore/basic/r/mcol4766-rollback-ranges.result +++ b/mysql-test/columnstore/basic/r/mcol4766-rollback-ranges.result @@ -25,3 +25,4 @@ SELECT * FROM t; x 1 2 +DROP DATABASE MCOL4766; diff --git a/mysql-test/columnstore/basic/r/mcs39_select_function_calls.result b/mysql-test/columnstore/basic/r/mcs39_select_function_calls.result index 89d2ba3e4..b124e171b 100644 --- a/mysql-test/columnstore/basic/r/mcs39_select_function_calls.result +++ b/mysql-test/columnstore/basic/r/mcs39_select_function_calls.result @@ -1,3 +1,4 @@ +SET GLOBAL log_bin_trust_function_creators = 1; DROP DATABASE IF EXISTS mcs39_db; CREATE DATABASE mcs39_db; USE mcs39_db; diff --git a/mysql-test/columnstore/basic/t/ctype_extent_koi8u.test b/mysql-test/columnstore/basic/t/ctype_extent_koi8u.test index 9e2e61989..125c3706b 100644 --- a/mysql-test/columnstore/basic/t/ctype_extent_koi8u.test +++ b/mysql-test/columnstore/basic/t/ctype_extent_koi8u.test @@ -1,5 +1,6 @@ --source ../include/have_columnstore.inc --source ../include/func_caltrace_create_if_needed.inc +SET GLOBAL log_bin_trust_function_creators = 1; --disable_warnings DROP DATABASE IF EXISTS mcs_ctype_extent_koi8u; --enable_warnings diff --git a/mysql-test/columnstore/basic/t/ctype_extent_latin1.test b/mysql-test/columnstore/basic/t/ctype_extent_latin1.test index eda30160a..ea165a554 100644 --- a/mysql-test/columnstore/basic/t/ctype_extent_latin1.test +++ b/mysql-test/columnstore/basic/t/ctype_extent_latin1.test @@ -1,5 +1,6 @@ --source ../include/have_columnstore.inc --source ../include/func_caltrace_create_if_needed.inc +SET GLOBAL log_bin_trust_function_creators = 1; --disable_warnings DROP DATABASE IF EXISTS mcs_ctype_extent_latin1; --enable_warnings diff --git a/mysql-test/columnstore/basic/t/ctype_extent_utf8mb3.test b/mysql-test/columnstore/basic/t/ctype_extent_utf8mb3.test index 529cb950c..665a39043 100644 --- a/mysql-test/columnstore/basic/t/ctype_extent_utf8mb3.test +++ b/mysql-test/columnstore/basic/t/ctype_extent_utf8mb3.test @@ -1,5 +1,6 @@ --source ../include/have_columnstore.inc --source ../include/func_caltrace_create_if_needed.inc +SET GLOBAL log_bin_trust_function_creators = 1; --disable_warnings DROP DATABASE IF EXISTS mcs_ctype_extent_utf8mb3; --enable_warnings diff --git a/mysql-test/columnstore/basic/t/mcol3738_count_distinct_multiparm.test b/mysql-test/columnstore/basic/t/mcol3738_count_distinct_multiparm.test index dca6f57db..d66f612d1 100644 --- a/mysql-test/columnstore/basic/t/mcol3738_count_distinct_multiparm.test +++ b/mysql-test/columnstore/basic/t/mcol3738_count_distinct_multiparm.test @@ -34,15 +34,15 @@ insert into t1 values (1, 2, 2, 1, "something this way comes"), select count(distinct c1, c2), count(distinct char1) from t1; select idx, count(distinct c1, c2), count(distinct c1, c3, char1) from t1 group by idx order by idx; select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1; -select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1; -select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2) from t1 group by c1; -select avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1; -select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1; +select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7; +select avg(distinct c2), count(c2), count( distinct c2, c3), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7; +select avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7; +select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1 order by 1, 2, 3, 4, 5, 6, 7; # group_concat causes the aggregation to be performed on UM only. -select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1; -select idx, sum(c3), count(distinct c1, c2), count(distinct c1, c3, char1), group_concat("ls_", char1) from t1 group by idx order by idx; -select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1; +select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3) from t1 group by c1 order by 1, 2, 3, 4, 5, 6, 7; +select idx, sum(c3), count(distinct c1, c2), count(distinct c1, c3, char1), group_concat("ls_", char1) from t1 group by idx order by 1, 2, 3, 4, 5; +select group_concat(distinct char1), avg(distinct c2), count(c2), count( distinct c2), count(c2),sum(distinct c2), avg(distinct c3), count(distinct c2, c3, c1) from t1 order by 1, 2, 3, 4, 5, 6, 7; # Clean UP DROP DATABASE mcol_3738_db; diff --git a/mysql-test/columnstore/basic/t/mcol4766-rollback-ranges.test b/mysql-test/columnstore/basic/t/mcol4766-rollback-ranges.test index c6d9042cd..1d7c297bf 100644 --- a/mysql-test/columnstore/basic/t/mcol4766-rollback-ranges.test +++ b/mysql-test/columnstore/basic/t/mcol4766-rollback-ranges.test @@ -16,3 +16,4 @@ SELECT c.table_schema, c.table_name, c.column_name, e.min_value, e.max_value FRO ROLLBACK; SELECT c.table_schema, c.table_name, c.column_name, e.min_value, e.max_value FROM information_schema.columnstore_extents e, information_schema.columnstore_columns c WHERE c.table_schema='MCOL4766' and c.table_name='t' and c.column_name='x' and c.object_id=e.object_id; SELECT * FROM t; +DROP DATABASE MCOL4766; diff --git a/mysql-test/columnstore/basic/t/mcs39_select_function_calls.test b/mysql-test/columnstore/basic/t/mcs39_select_function_calls.test index f6f40408a..fb74d9ba2 100644 --- a/mysql-test/columnstore/basic/t/mcs39_select_function_calls.test +++ b/mysql-test/columnstore/basic/t/mcs39_select_function_calls.test @@ -3,7 +3,7 @@ # Author: Bharath, bharath.bokka@mariadb.com # -- source ../include/have_columnstore.inc - +SET GLOBAL log_bin_trust_function_creators = 1; --disable_warnings DROP DATABASE IF EXISTS mcs39_db; --enable_warnings