Fix bad merge of sql/item_strfunc.cc by aivanov

sql/item_strfunc.cc: Fix bad merge

Fix bad merge of sql/item_strfunc.cc by aivanov
sql/item_strfunc.cc: Fix bad merge
99a6ba99 · unknown · 0e59e9d7 · 99a6ba99
Commit 99a6ba99 authored Aug 17, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

sql/item_strfunc.cc sql/item_strfunc.cc +0 -3

No files found.
--- 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;