From cfb4d9f9dcc6e6bac92785fb32779e157d52daee Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.org>
Date: Thu, 27 Apr 2017 15:02:35 +0400
Subject: MDEV-12592 Illegal mix of collations with the HEX function

Fixing repertoire for HEX() from MY_REPERTOIRE_EXTENDED to MY_REPERTOIRE_ASCII.
---
 mysql-test/r/func_str.result | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'mysql-test/r/func_str.result')

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index 4194a6359c6..8a1302c9b5c 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -4661,3 +4661,20 @@ DROP TABLE t1;
 #
 # End of 10.1 tests
 #
+#
+# Start of 10.3 tests
+#
+#
+# MDEV-12592 Illegal mix of collations with the HEX function
+#
+SET NAMES utf8;
+CREATE TABLE t1 (a VARCHAR(10) CHARACTER SET latin1);
+INSERT INTO t1 VALUES (0x09),('a');
+SELECT IF(a<' ',HEX(a),a) FROM t1 ORDER BY a;
+IF(a<' ',HEX(a),a)
+09
+a
+DROP TABLE  t1;
+#
+# End of 10.3 tests
+#
-- 
cgit v1.2.1