Commit 4f0facff authored by unknown's avatar unknown

Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988,...

Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08-16 00:03:50+04:00, aivanov@mysql.com
 )

parent 3d1c8ed0
...@@ -2176,9 +2176,6 @@ void Item_func_lpad::fix_length_and_dec() ...@@ -2176,9 +2176,6 @@ void Item_func_lpad::fix_length_and_dec()
{ {
ulonglong length= ((ulonglong) args[1]->val_int() * ulonglong length= ((ulonglong) args[1]->val_int() *
collation.collation->mbmaxlen); collation.collation->mbmaxlen);
/*a comment before (merged) */
length= max((ulonglong)args[0]->max_length, length);
/*a comment after */
if (length >= MAX_BLOB_WIDTH) if (length >= MAX_BLOB_WIDTH)
{ {
length= MAX_BLOB_WIDTH; length= MAX_BLOB_WIDTH;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment