Merge 10.5 into 10.6

1 files changed, 10 insertions, 10 deletions

diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result
index 7bc81462988..0b16d1cf6f2 100644
--- a/mysql-test/main/ctype_latin1.result
+++ b/mysql-test/main/ctype_latin1.result
@@ -7965,37 +7965,37 @@ SELECT 'Â';
 ?
 ?
 SELECT HEX('Â');
-HEX('Â')
+HEX('\xC2')
 3F
 SELECT HEX(CAST('Â' AS CHAR CHARACTER SET utf8));
-HEX(CAST('Â' AS CHAR CHARACTER SET utf8))
+HEX(CAST('\xC2' AS CHAR CHARACTER SET utf8))
 3F
 SELECT HEX(CAST('Â' AS CHAR CHARACTER SET latin1));
-HEX(CAST('Â' AS CHAR CHARACTER SET latin1))
+HEX(CAST('\xC2' AS CHAR CHARACTER SET latin1))
 3F
 SELECT HEX(CONVERT('Â' USING utf8));
-HEX(CONVERT('Â' USING utf8))
+HEX(CONVERT('\xC2' USING utf8))
 3F
 SELECT HEX(CONVERT('Â' USING latin1));
-HEX(CONVERT('Â' USING latin1))
+HEX(CONVERT('\xC2' USING latin1))
 3F
 SELECT 'Âx';
 ?x
 ?x
 SELECT HEX('Âx');
-HEX('Âx')
+HEX('\xC2x')
 3F78
 SELECT HEX(CAST('Âx' AS CHAR CHARACTER SET utf8));
-HEX(CAST('Âx' AS CHAR CHARACTER SET utf8))
+HEX(CAST('\xC2x' AS CHAR CHARACTER SET utf8))
 3F78
 SELECT HEX(CAST('Âx' AS CHAR CHARACTER SET latin1));
-HEX(CAST('Âx' AS CHAR CHARACTER SET latin1))
+HEX(CAST('\xC2x' AS CHAR CHARACTER SET latin1))
 3F78
 SELECT HEX(CONVERT('Âx' USING utf8));
-HEX(CONVERT('Âx' USING utf8))
+HEX(CONVERT('\xC2x' USING utf8))
 3F78
 SELECT HEX(CONVERT('Âx' USING latin1));
-HEX(CONVERT('Âx' USING latin1))
+HEX(CONVERT('\xC2x' USING latin1))
 3F78
 SET NAMES utf8;
 CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1);