diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-04-27 15:02:35 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-04-27 15:02:35 +0400 |
| commit | cfb4d9f9dcc6e6bac92785fb32779e157d52daee (patch) | |
| tree | 6a6d6e611e62b25542f3f5a9b8c2985f3db32397 /sql/item_strfunc.h | |
| parent | 441349aa0659f07828af7c09164e142b8d565b3a (diff) | |
| download | mariadb-git-cfb4d9f9dcc6e6bac92785fb32779e157d52daee.tar.gz | |
MDEV-12592 Illegal mix of collations with the HEX function
Fixing repertoire for HEX() from MY_REPERTOIRE_EXTENDED to MY_REPERTOIRE_ASCII.
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 58bd6c99f80..6fdee625749 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -1074,7 +1074,7 @@ public: } void fix_length_and_dec() { - collation.set(default_charset()); + collation.set(default_charset(), DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); decimals=0; fix_char_length(args[0]->max_length * 2); m_arg0_type_handler= args[0]->type_handler(); |