Commit d44c9e48 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/alexi/mysql-4.1-bug1 

into  mysql.com:/home/alexi/mysql-5.0


sql/item_strfunc.cc:
  Auto merged
mysql-test/t/select.test:
  Merging BUG#XXX to 5.0 (test, will not push)
parents 4fc1f429 15a35982

sql/item_strfunc.cc

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