mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
Merge 10.2 into 10.3
This commit is contained in:
commit
c7f322c91f
32 changed files with 1636 additions and 97 deletions
|
|
@ -539,8 +539,11 @@ static inline int my_b_write(IO_CACHE *info, const uchar *Buffer, size_t Count)
|
|||
MEM_CHECK_DEFINED(Buffer, Count);
|
||||
if (info->write_pos + Count <= info->write_end)
|
||||
{
|
||||
memcpy(info->write_pos, Buffer, Count);
|
||||
info->write_pos+= Count;
|
||||
if (Count)
|
||||
{
|
||||
memcpy(info->write_pos, Buffer, Count);
|
||||
info->write_pos+= Count;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
return _my_b_write(info, Buffer, Count);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue