Commit c471e84b authored by unknown's avatar unknown
Browse files

Fix bad merge of sql/item_strfunc.cc by aivanov 


sql/item_strfunc.cc:
  Fix bad merge
parent f90f6541

sql/item_strfunc.cc

+0 −3
Original line number Diff line number Diff line
@@ -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;