database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/alexi/mysql-4.1-bug1
This commit is contained in:
aivanov@mysql.com
2005-07-26 20:48:43 +04:00
parent 92e7d181f9 95d3bd8bad
commit 09ae9fbe89
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/item_strfunc.cc
View File

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