diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-10 13:34:59 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-10 13:34:59 +0400 |
| commit | 03f6778d61a74bdd7d09103a16473a2a5624cf66 (patch) | |
| tree | c24fbedad48bfedde09cba9e3561b24ab35e575d /sql/item_cmpfunc.cc | |
| parent | 1f4f425a2007c51eeee35f911a787fc7d82d977c (diff) | |
| download | mariadb-git-03f6778d61a74bdd7d09103a16473a2a5624cf66.tar.gz | |
MDEV-5298 Illegal mix of collations on timestamp
Fixed.
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -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 e6688a5daa9..714eb8be7ee 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; |