database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2020-09-03 09:10:03 +03:00
parent 9aea50616c 94a520ddbe
commit 2a93e632b1
11 changed files with 66 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/debug_sync.cc
View File

@ -1,4 +1,5 @@
/* Copyright (c) 2009, 2013, Oracle and/or its affiliates.
Copyright (c) 2013, 2020, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -319,7 +320,8 @@ static char *debug_sync_bmove_len(char *to, char *to_end,
DBUG_ASSERT(to_end);
DBUG_ASSERT(!length || from);
set_if_smaller(length, (size_t) (to_end - to));
memcpy(to, from, length);
if (length)
memcpy(to, from, length);
return (to + length);
}