diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-14 18:06:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-14 18:06:51 +0300 |
| commit | 1d15a28e52e41fae0847284089b2073ab33162a5 (patch) | |
| tree | 3d2dbd3ebda6547c26642e597b5cafc56e7ed031 /sql/item_strfunc.cc | |
| parent | c4feef50cfa4033e646636ed37e255d2b3593fbf (diff) | |
| parent | a20f6f9853e522ad388f5b968ce11af3c5d1fc10 (diff) | |
| download | mariadb-git-1d15a28e52e41fae0847284089b2073ab33162a5.tar.gz | |
Merge 10.3 into 10.4
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 7151e8966ee..98da93ae699 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; |