diff options
author | unknown <sergefp@mysql.com> | 2005-08-18 18:26:30 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2005-08-18 18:26:30 +0400 |
commit | 4f0facffada396ec7ed09ce960f4b0ef329ca2a8 (patch) | |
tree | 9882f005568762ffeae1f2ab2a5b186a0ad76d44 /sql/item_strfunc.cc | |
parent | 3d1c8ed06ed5c737b30e9cd2e1a36d54238d49cf (diff) | |
download | mariadb-git-4f0facffada396ec7ed09ce960f4b0ef329ca2a8.tar.gz |
Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08-16 00:03:50+04:00, aivanov@mysql.com
)
Diffstat (limited to 'sql/item_strfunc.cc')
-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; |