diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2004-06-07 17:39:17 +0400 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2004-06-07 17:39:17 +0400 |
| commit | fd94477b4315735056f75170ecb97c68fee39122 (patch) | |
| tree | 9bac448fd15486d86e3e12a0be7d398cf1b3c94e /sql/item_strfunc.cc | |
| parent | 5cc410bb70dca2fad9dd7452ef294e1020186dda (diff) | |
| download | mariadb-git-fd94477b4315735056f75170ecb97c68fee39122.tar.gz | |
Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character
mysql-test/r/ctype_ucs.result:
Test for bug#3946: Error in LPAD() when padstring is longer than 1 character
mysql-test/t/ctype_ucs.test:
Test for bug#3946: Error in LPAD() when padstring is longer than 1 character
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index c6401218fe2..6be9bee438e 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2097,10 +2097,8 @@ String *Item_func_lpad::val_str(String *str) count-= pad_char_length; } if (count > 0) - { - pad->length(pad->charpos(count)); - str->append(*pad); - } + str->append(pad->ptr(), pad->charpos(count), collation.collation); + str->append(*res); null_value= 0; return str; |