diff options
| author | unknown <sergefp@mysql.com> | 2005-08-18 18:28:02 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-08-18 18:28:02 +0400 |
| commit | 6713cff5fe227f517898e97cac46cbd462ded936 (patch) | |
| tree | 367c3617e2a2fb61b14740df2f26f59dd200dc70 | |
| parent | 749f599efa81de151401d0af33c4b31292727b15 (diff) | |
| parent | d150e4a2f4c770e726aa0768fa6adcb92b98bc8f (diff) | |
| download | mariadb-git-6713cff5fe227f517898e97cac46cbd462ded936.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-aug18-fix
| -rw-r--r-- | sql/item_strfunc.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 1e1cc123e60..094a0c56319 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2176,9 +2176,6 @@ void Item_func_lpad::fix_length_and_dec() { ulonglong length= ((ulonglong) args[1]->val_int() * collation.collation->mbmaxlen); - /*a comment before (merged) */ - length= max((ulonglong)args[0]->max_length, length); - /*a comment after */ if (length >= MAX_BLOB_WIDTH) { length= MAX_BLOB_WIDTH; |