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/protocol.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/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 887177c0a19..598d102ec29 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -713,7 +713,8 @@ bool Protocol::store_string_aux(const char *from, uint length, fromcs != &my_charset_bin && tocs != &my_charset_bin) { - return convert->copy(from, length, fromcs, tocs) || + uint dummy_errors; + return convert->copy(from, length, fromcs, tocs, &dummy_errors) || net_store_data(convert->ptr(), convert->length()); } return net_store_data(from, length); |