Commit 15a35982 authored by unknown's avatar unknown
Browse files

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

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


sql/item_strfunc.cc:
  test merge attempt, please ignore
parents 08216d3a 0d9ab525

mysql-test/t/select.test

+2 −0
Original line number Diff line number Diff line
@@ -2162,4 +2162,6 @@ select found_rows(); 
select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3;

select found_rows();



#BUG#234321

select 2+23;

DROP TABLE t1;

sql/item_strfunc.cc

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