diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2014-04-23 10:28:06 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2014-04-23 10:28:06 +0400 |
| commit | 2f93e7cf4766ee53d38343dbc46c12bdcc134601 (patch) | |
| tree | 14c5e5989c83e81f42f79d81ae706e8d52be5689 /sql/item_func.cc | |
| parent | 31c82360e49ab773f00037796be9f28910baacec (diff) | |
| download | mariadb-git-2f93e7cf4766ee53d38343dbc46c12bdcc134601.tar.gz | |
MDEV-6146 Can't mix (latin1_swedish_ci,NUMERIC) and (utf8_unicode_ci,IMPLICIT) for MATCH
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 453494b374f..4dc25264605 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -6295,8 +6295,7 @@ bool Item_func_match::fix_fields(THD *thd, Item **ref) return 1; } table->fulltext_searched=1; - return agg_item_collations_for_comparison(cmp_collation, func_name(), - args+1, arg_count-1, 0); + return agg_arg_charsets_for_comparison(cmp_collation, args+1, arg_count-1); } bool Item_func_match::fix_index() |