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.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.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 18025d6d689..46215fd78ed 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -818,7 +818,9 @@ bool Item_param::set_str(const char *str, ulong length) Assign string with no conversion: data is converted only after it's been written to the binary log. */ - if (str_value.copy(str, length, &my_charset_bin, &my_charset_bin)) + uint dummy_errors; + if (str_value.copy(str, length, &my_charset_bin, &my_charset_bin, + &dummy_errors)) DBUG_RETURN(TRUE); state= STRING_VALUE; maybe_null= 0; |