diff options
| author | bar@mysql.com <> | 2004-10-29 17:00:39 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2004-10-29 17:00:39 +0500 |
| commit | 7577c8bfc9efb21b8a8a3c08e342054e754370ab (patch) | |
| tree | 9cc9765d8b1a393421a6e3df083461c690d1c028 /sql/item_func.cc | |
| parent | 64c59b37f899e520f6ba3ff8d0f9724423eb9b88 (diff) | |
| download | mariadb-git-7577c8bfc9efb21b8a8a3c08e342054e754370ab.tar.gz | |
A fix according to Monty's request:
"uint *errors" is now a non-optional parameter in String:copy()
and copy_and_convert().
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 3cb125d2868..50843d3bf76 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2906,8 +2906,9 @@ void Item_func_match::init_search(bool no_order) if (ft_tmp->charset() != cmp_collation.collation) { + uint dummy_errors; search_value.copy(ft_tmp->ptr(), ft_tmp->length(), ft_tmp->charset(), - cmp_collation.collation); + cmp_collation.collation, &dummy_errors); ft_tmp= &search_value; } |