diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-25 09:13:28 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-12-25 09:13:28 +0100 |
| commit | 478b83032b170b2ae030fa77fe4bed60a7910472 (patch) | |
| tree | a3893bb725e227dc15c6997731cdeba622ae1744 /sql/field.cc | |
| parent | 0aa02567dd62d96467f84ba96cc67b103f63c9e0 (diff) | |
| parent | 043bd85a574a88856ab9c6d497e682ed06fe45e9 (diff) | |
| download | mariadb-git-478b83032b170b2ae030fa77fe4bed60a7910472.tar.gz | |
Merge branch '10.3' into 10.4bb-10.4-MDEV-23468
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 5a694b50fe0..70598619acd 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8494,7 +8494,7 @@ int Field_blob::store(const char *from,size_t length,CHARSET_INFO *cs) DBUG_ASSERT(length <= max_data_length()); new_length= length; - copy_length= (size_t)MY_MIN(UINT_MAX,table->in_use->variables.group_concat_max_len); + copy_length= table->in_use->variables.group_concat_max_len; if (new_length > copy_length) { new_length= Well_formed_prefix(cs, |