From 7ebeee06e967e51680c4d365c64740276c3a6e77 Mon Sep 17 00:00:00 2001
From: Daniel Lee <daniel.lee@mariadb.com>
Date: Fri, 8 Jul 2022 11:59:22 -0500
Subject: [PATCH] Need to add order by clause since different test run would
 return rows in different order

---
 .../basic/t/mcol3738_count_distinct_multiparm.test        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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..7458a2032 100644
--- a/mysql-test/columnstore/basic/t/mcol3738_count_distinct_multiparm.test
+++ b/mysql-test/columnstore/basic/t/mcol3738_count_distinct_multiparm.test
@@ -34,10 +34,10 @@ 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;