From e61f89747678581be98b6ddb3494ebca54c985c1 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 22 Jul 2005 11:46:29 -0700 Subject: Fix calculation for length of LPAD() and RPAD() reported to client via mysql_fetch_fields(). (Bug #11311) mysql-test/r/func_str.result: Add new results mysql-test/t/func_str.test: Add new regression test sql/item_strfunc.cc: Fix length reported for LPAD() and RPAD() -- they always truncate to the length that is given. --- sql/item_strfunc.cc | 2 -- 1 file changed, 2 deletions(-) (limited to 'sql/item_strfunc.cc') diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 3a5ddd583ef..d316c7eaf72 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2042,7 +2042,6 @@ void Item_func_rpad::fix_length_and_dec() { ulonglong length= ((ulonglong) args[1]->val_int() * collation.collation->mbmaxlen); - length= max((ulonglong) args[0]->max_length, length); if (length >= MAX_BLOB_WIDTH) { length= MAX_BLOB_WIDTH; @@ -2130,7 +2129,6 @@ void Item_func_lpad::fix_length_and_dec() { ulonglong length= ((ulonglong) args[1]->val_int() * collation.collation->mbmaxlen); - length= max((ulonglong) args[0]->max_length, length); if (length >= MAX_BLOB_WIDTH) { length= MAX_BLOB_WIDTH; -- cgit v1.2.1