From 6e781e11a9f7606b8b41532c382df9cf00617d17 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 29 Oct 2004 17:00:39 +0500 Subject: A fix according to Monty's request: "uint *errors" is now a non-optional parameter in String:copy() and copy_and_convert(). --- sql/protocol.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/protocol.cc') 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); -- cgit v1.2.1