diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 17:46:05 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 17:46:05 +0300 |
commit | 5ece2155cba93a9a57e37d0c4ec624145cf8d4cf (patch) | |
tree | cec927b268e9ac53767573ce21d53b811a9662ce /mysql-test/main/ctype_utf8.result | |
parent | db6e5bd9aaec7239d7c62820849a61b1059e4ad9 (diff) | |
parent | b8e694a314b538b8bebec03a78b6df6570bd608b (diff) | |
download | mariadb-git-5ece2155cba93a9a57e37d0c4ec624145cf8d4cf.tar.gz |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/ctype_utf8.result')
-rw-r--r-- | mysql-test/main/ctype_utf8.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result index 3a6c591d6d0..75048d9cbe6 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -11324,6 +11324,18 @@ SELECT x AS 5天内最近一次登录时间 FROM t1; 1 DROP TABLE t1; # +# MDEV-22391 Assertion `0' failed in Item_type_holder::val_str on utf16 charset table query +# +SET NAMES utf8; +VALUES (_latin1 0xDF) UNION SELECT _utf8'a' COLLATE utf8_bin; +_latin1 0xDF +ß +a +VALUES (_latin1 0xDF) UNION VALUES(_utf8'a' COLLATE utf8_bin); +_latin1 0xDF +ß +a +# # End of 10.3 tests # # |