Fixing non-determenistic results.

mysql-test/include/ctype_utf8mb4.inc

@@ -1255,11 +1255,9 @@ eval create table t1(a char(200) collate utf8mb4_unicode_ci NOT NULL default '')
   default charset=utf8mb4 collate=utf8mb4_unicode_ci engine $engine;
 insert into t1 values (unhex('65')), (unhex('C3A9')), (unhex('65'));
 explain select distinct a from t1;
---sorted_result
-select distinct a from t1;
+SELECT COUNT(*) FROM (SELECT DISTINCT a FROM t1) AS t2;
 explain select a from t1 group by a;
---sorted_result
-select a from t1 group by a;
+SELECT COUNT(*) FROM (SELECT a FROM t1 GROUP BY a) AS t2;
 drop table t1;
 
 #

mysql-test/r/ctype_utf8mb4_heap.result

@@ -1398,15 +1398,15 @@ insert into t1 values (unhex('65')), (unhex('C3A9')), (unhex('65'));
 explain select distinct a from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary
-select distinct a from t1;
-a
-e
+SELECT COUNT(*) FROM (SELECT DISTINCT a FROM t1) AS t2;
+COUNT(*)
+1
 explain select a from t1 group by a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary; Using filesort
-select a from t1 group by a;
-a
-e
+SELECT COUNT(*) FROM (SELECT a FROM t1 GROUP BY a) AS t2;
+COUNT(*)
+1
 drop table t1;
 create table t1(a char(10)) default charset utf8mb4 engine heap;
 insert into t1 values ('123'), ('456');

mysql-test/r/ctype_utf8mb4_innodb.result

@@ -1526,15 +1526,15 @@ insert into t1 values (unhex('65')), (unhex('C3A9')), (unhex('65'));
 explain select distinct a from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary
-select distinct a from t1;
-a
-e
+SELECT COUNT(*) FROM (SELECT DISTINCT a FROM t1) AS t2;
+COUNT(*)
+1
 explain select a from t1 group by a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary; Using filesort
-select a from t1 group by a;
-a
-e
+SELECT COUNT(*) FROM (SELECT a FROM t1 GROUP BY a) AS t2;
+COUNT(*)
+1
 drop table t1;
 create table t1(a char(10)) default charset utf8mb4 engine InnoDB;
 insert into t1 values ('123'), ('456');

mysql-test/r/ctype_utf8mb4_myisam.result

@@ -1526,15 +1526,15 @@ insert into t1 values (unhex('65')), (unhex('C3A9')), (unhex('65'));
 explain select distinct a from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary
-select distinct a from t1;
-a
-e
+SELECT COUNT(*) FROM (SELECT DISTINCT a FROM t1) AS t2;
+COUNT(*)
+1
 explain select a from t1 group by a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary; Using filesort
-select a from t1 group by a;
-a
-e
+SELECT COUNT(*) FROM (SELECT a FROM t1 GROUP BY a) AS t2;
+COUNT(*)
+1
 drop table t1;
 create table t1(a char(10)) default charset utf8mb4 engine MyISAM;
 insert into t1 values ('123'), ('456');

mysql-test/r/ctype_utf8mb4_ndb.result

@@ -1034,15 +1034,15 @@ insert into t1 values (unhex('65')), (unhex('C3A9')), (unhex('65'));
 explain select distinct a from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary
-select distinct a from t1;
-a
-e
+SELECT COUNT(*) FROM (SELECT DISTINCT a FROM t1) AS t2;
+COUNT(*)
+1
 explain select a from t1 group by a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using temporary; Using filesort
-select a from t1 group by a;
-a
-e
+SELECT COUNT(*) FROM (SELECT a FROM t1 GROUP BY a) AS t2;
+COUNT(*)
+1
 drop table t1;
 create table t1(a char(10)) default charset utf8mb4 engine ndb;
 insert into t1 values ('123'), ('456');