mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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


mysql-test/t/select.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
This commit is contained in:
unknown 2005-08-16 00:03:50 +04:00
commit 14fec24b3c
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/item_strfunc.cc
View file

@ -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;