diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 12:25:23 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 12:25:23 +0300 |
commit | d8dc3c72b6b18ace73f521b9191c8a53c1cb5e78 (patch) | |
tree | dc7463242a21d7835b3967518441cb5efc7bd2a9 /mysql-test/main/ctype_utf8.result | |
parent | 2bf93a8fd6d8d7563edc248183ca8b54a5d76dff (diff) | |
parent | f4f0ef3e3771281b7f25bc26cc2cbf4e2dbe325a (diff) | |
download | mariadb-git-d8dc3c72b6b18ace73f521b9191c8a53c1cb5e78.tar.gz |
Merge 10.3 into 10.4
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 9cb7fc0ad76..b855f683910 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -11321,5 +11321,17 @@ 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 # |