diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-01-06 10:53:00 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-01-06 10:53:00 +0100 |
| commit | 02e7bff882c5169ba3e1ce7e9a93d4c28fe3afd1 (patch) | |
| tree | 4a6a8d578fedb4c2b1f437ab39c2d7430ad95163 /sql/field.cc | |
| parent | 5f10870c8a8c2448bfc26d990110390d48000b84 (diff) | |
| parent | 478b83032b170b2ae030fa77fe4bed60a7910472 (diff) | |
| download | mariadb-git-02e7bff882c5169ba3e1ce7e9a93d4c28fe3afd1.tar.gz | |
Merge commit '10.4' into 10.5
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 2173670572d..45b3a3c703e 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8549,7 +8549,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, |