diff --git a/mysql-test/columnstore/basic/r/ctype_extent_koi8u.result b/mysql-test/columnstore/basic/r/ctype_extent_koi8u.result index eeb715c77..ffb3c5a93 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 70cbb89da..39efdf1e4 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..b38d669c2 100644 --- a/mysql-test/columnstore/basic/r/mcol3738_count_distinct_multiparm.result +++ b/mysql-test/columnstore/basic/r/mcol3738_count_distinct_multiparm.result @@ -32,25 +32,25 @@ 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; 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 +elsewhere this way comes,something this way comes 3.0000 6 3 6 9 2.0000 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; 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 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;