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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-10-30 13:53:10 +02:00
parent 066773e2f0 1fddccf676
commit 03357ded17
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_string.h
View File

@ -314,7 +314,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;
}