diff options
author | Alexander Barkov <bar@mariadb.com> | 2019-10-24 14:00:48 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2019-10-24 14:00:48 +0400 |
commit | 8ba5af7eafb0b1bcfbb9ad03de2fdf49a02aead7 (patch) | |
tree | f544dcdbb2535a49b51239ddb17ab7d5156913b9 /sql/item_strfunc.h | |
parent | 88cdfc5c7d4764e5267c87eadeb8c3f95faa73d0 (diff) | |
download | mariadb-git-8ba5af7eafb0b1bcfbb9ad03de2fdf49a02aead7.tar.gz |
MDEV-20890 Illegal mix of collations with UUID()
Diffstat (limited to 'sql/item_strfunc.h')
-rw-r--r-- | sql/item_strfunc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 81f72b6bb83..e84696fe22c 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -1663,8 +1663,7 @@ public: Item_func_uuid(THD *thd): Item_str_func(thd) {} bool fix_length_and_dec() { - collation.set(system_charset_info, - DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); + collation.set(DTCollation_numeric()); fix_char_length(MY_UUID_STRING_LENGTH); return FALSE; } |