diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 07:50:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 07:50:05 +0300 |
| commit | 657bcf928eb1c6a80ee2c82f0dcdd59ab02927e4 (patch) | |
| tree | c692f1600c06da934cf44240228516eed88c868f /sql/sql_string.cc | |
| parent | e97b785d764f85009412947600195001be01a706 (diff) | |
| parent | 563daec123728f69dc56d898d1d8b198e9e2d411 (diff) | |
| download | mariadb-git-657bcf928eb1c6a80ee2c82f0dcdd59ab02927e4.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 2b40a72edf3..3195f797e25 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -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)) { |