Commit 14fec24b authored by unknown's avatar unknown
Browse files

Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 

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


mysql-test/t/select.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
parents 219c84fa d44c9e48

sql/item_strfunc.cc

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