diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-16 14:35:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-16 14:35:32 +0300 |
| commit | 67ddb6507d58b08f88dfede96b057eae34d9d76e (patch) | |
| tree | 5f28ca11d7940d4fc17b6b9182eda27bae88e70f /sql/item_strfunc.cc | |
| parent | 6073049a3675363f7d7efe26f47525b528be9e2f (diff) | |
| parent | c221bcdce7714a74b89a02de941e8d8df2994ce3 (diff) | |
| download | mariadb-git-67ddb6507d58b08f88dfede96b057eae34d9d76e.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index b0eb8f4d158..234d36b36fe 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -3176,7 +3176,7 @@ bool Item_func_pad::fix_length_and_dec() DBUG_ASSERT(collation.collation->mbmaxlen > 0); if (args[1]->const_item() && !args[1]->is_expensive()) { - fix_char_length(Repeat_count(args[1]).count()); + fix_char_length_ulonglong(Repeat_count(args[1]).count()); return false; } max_length= MAX_BLOB_WIDTH; |