mirror of
https://github.com/MariaDB/server.git
synced 2026-05-04 14:15:33 +02:00
A fix according to Monty's request:
"uint *errors" is now a non-optional parameter in String:copy() and copy_and_convert().
This commit is contained in:
parent
fcb322279e
commit
6e781e11a9
14 changed files with 72 additions and 37 deletions
|
|
@ -108,8 +108,11 @@ char *sql_strmake_with_convert(const char *str, uint32 arg_length,
|
|||
memcpy(pos, str, new_length);
|
||||
}
|
||||
else
|
||||
{
|
||||
uint dummy_errors;
|
||||
new_length= copy_and_convert((char*) pos, new_length, to_cs, str,
|
||||
arg_length, from_cs);
|
||||
arg_length, from_cs, &dummy_errors);
|
||||
}
|
||||
pos[new_length]= 0;
|
||||
*result_length= new_length;
|
||||
return pos;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue