diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-04-28 17:01:58 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-04-28 17:01:58 +0400 |
| commit | f467f4bb934a9a73e9a5643f5b674d02d4d0aa6b (patch) | |
| tree | e1b3141e8f63d24e3342e8a9695dc6106de4dfa3 /sql | |
| parent | 1081e403c6ebc551b5a0242e452ccb995b262432 (diff) | |
| download | mariadb-git-f467f4bb934a9a73e9a5643f5b674d02d4d0aa6b.tar.gz | |
MDEV-5459 Illegal mix of collations for datetime
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index fa14f7bdcf1..998cb1cbd64 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -549,8 +549,8 @@ void Item_bool_func2::fix_length_and_dec() */ DTCollation coll; - if (args[0]->result_type() == STRING_RESULT && - args[1]->result_type() == STRING_RESULT && + if (args[0]->cmp_type() == STRING_RESULT && + args[1]->cmp_type() == STRING_RESULT && agg_arg_charsets_for_comparison(coll, args, 2)) return; |