MDEV-12020 ctype tests are non-deterministic due to missing sorting

Author: Alexander Barkov

mysql-test/r/ctype_utf8.result

@@ -10494,7 +10494,7 @@ DELETE FROM t1;
 LOAD DATA INFILE '../../std_data/loaddata/mdev9824.txt' INTO TABLE t1 CHARACTER SET utf8 LINES TERMINATED BY 'ёё' IGNORE 1 LINES;
 Warnings:
 Warning	1638	Non-ASCII separator arguments are not fully supported
-SELECT c1 FROM t1;
+SELECT c1 FROM t1 ORDER BY c1;
 c1
 b
 c

mysql-test/r/ctype_utf8mb4.result

@@ -2323,16 +2323,16 @@ insert into t1 values (0xF0BFBFBF);
 insert into t1 values (0xF08F8080);
 Warnings:
 Warning	1366	Incorrect string value: '\xF0\x8F\x80\x80' for column 'utf8mb4' at row 1
-select hex(utf8mb4) from t1;
+select hex(utf8mb4) from t1 order by binary utf8mb4;
 hex(utf8mb4)
+3F
 F0908080
 F0BFBFBF
-3F
 delete from t1;
 Testing [F2..F3][80..BF][80..BF][80..BF]
 insert into t1 values (0xF2808080);
 insert into t1 values (0xF2BFBFBF);
-select hex(utf8mb4) from t1;
+select hex(utf8mb4) from t1 order by binary utf8mb4;
 hex(utf8mb4)
 F2808080
 F2BFBFBF
@@ -2343,11 +2343,11 @@ insert into t1 values (0xF48F8080);
 insert into t1 values (0xF4908080);
 Warnings:
 Warning	1366	Incorrect string value: '\xF4\x90\x80\x80' for column 'utf8mb4' at row 1
-select hex(utf8mb4) from t1;
+select hex(utf8mb4) from t1 order by binary utf8mb4;
 hex(utf8mb4)
+3F
 F4808080
 F48F8080
-3F
 drop table t1;
 #
 # Check strnxfrm() with odd length

mysql-test/t/ctype_utf8.test

@@ -2000,7 +2000,7 @@ LOAD DATA INFILE '../../std_data/loaddata/mdev9824.txt' INTO TABLE t1 CHARACTER
 SELECT c1 FROM t1;
 DELETE FROM t1;
 LOAD DATA INFILE '../../std_data/loaddata/mdev9824.txt' INTO TABLE t1 CHARACTER SET utf8 LINES TERMINATED BY 'ёё' IGNORE 1 LINES;
-SELECT c1 FROM t1;
+SELECT c1 FROM t1 ORDER BY c1;
 DROP TABLE t1;
 
 --echo #

mysql-test/t/ctype_utf8mb4.test

@@ -1491,20 +1491,20 @@ create table t1 (utf8mb4 char(1) character set utf8mb4);
 insert into t1 values (0xF0908080);
 insert into t1 values (0xF0BFBFBF);
 insert into t1 values (0xF08F8080);
-select hex(utf8mb4) from t1;
+select hex(utf8mb4) from t1 order by binary utf8mb4;
 delete from t1;
 
 --echo Testing [F2..F3][80..BF][80..BF][80..BF]
 insert into t1 values (0xF2808080);
 insert into t1 values (0xF2BFBFBF);
-select hex(utf8mb4) from t1;
+select hex(utf8mb4) from t1 order by binary utf8mb4;
 delete from t1;
 
 --echo Testing [F4][80..8F][80..BF][80..BF]
 insert into t1 values (0xF4808080);
 insert into t1 values (0xF48F8080);
 insert into t1 values (0xF4908080);
-select hex(utf8mb4) from t1;
+select hex(utf8mb4) from t1 order by binary utf8mb4;
 drop table t1;