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.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-28 07:50:05 +03:00
parent e97b785d76 563daec123
commit 657bcf928e
38 changed files with 642 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.cc
View File

@ -433,7 +433,7 @@ bool String::copy(const char *str, size_t arg_length,
{
uint32 offset;
DBUG_ASSERT(!str || str != Ptr);
DBUG_ASSERT(!str || str != Ptr || !alloced);
if (!needs_conversion(arg_length, from_cs, to_cs, &offset))
{