database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +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

3
sql/sql_string.h
View File

@@ -555,7 +555,8 @@ public:
}
void q_append(const char *data, size_t data_len)
{
memcpy(Ptr + str_length, data, data_len);
if (data_len)
memcpy(Ptr + str_length, data, data_len);
DBUG_ASSERT(str_length <= UINT_MAX32 - data_len);
str_length += (uint)data_len;
}