diff options
| author | unknown <bar@mysql.com> | 2004-10-29 17:00:39 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2004-10-29 17:00:39 +0500 |
| commit | 6e781e11a9f7606b8b41532c382df9cf00617d17 (patch) | |
| tree | 9cc9765d8b1a393421a6e3df083461c690d1c028 /sql/item_cmpfunc.cc | |
| parent | fcb322279eba22dcc29093d0212ea5a21f78ed59 (diff) | |
| download | mariadb-git-6e781e11a9f7606b8b41532c382df9cf00617d17.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_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index dc0377c791f..d9db07e2289 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -1832,8 +1832,9 @@ void Item_func_in::fix_length_and_dec() { Item_string *conv; String tmp, cstr, *ostr= arg[0]->val_str(&tmp); + uint dummy_errors; cstr.copy(ostr->ptr(), ostr->length(), ostr->charset(), - cmp_collation.collation); + cmp_collation.collation, &dummy_errors); conv= new Item_string(cstr.ptr(),cstr.length(), cstr.charset(), arg[0]->collation.derivation); conv->str_value.copy(); |