diff options
| author | unknown <jimw@mysql.com> | 2005-07-22 12:35:15 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-07-22 12:35:15 -0700 |
| commit | 6fd718dfbbe6f9644e0ade69424517cfcff19d8c (patch) | |
| tree | f92a75a856119748afdb36ea16fd51f742345470 /sql/item_strfunc.cc | |
| parent | fb006284d8d4c0f38f28c4b2edcc2bf98b00c767 (diff) | |
| parent | a4217760b409a0ab05b32f748da70dce629e4697 (diff) | |
| download | mariadb-git-6fd718dfbbe6f9644e0ade69424517cfcff19d8c.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/create.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/t/create.test:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/table.cc:
Resolve conflict
sql/unireg.cc:
Resolve conflict
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index eb37609c28e..256090d3e61 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2076,7 +2076,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; @@ -2164,7 +2163,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; |