mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 09ae9fbe89
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/t/select.test
View file

@ -2162,4 +2162,6 @@ select found_rows();
select SQL_CALC_FOUND_ROWS count(*) from t1 limit 2,3;
select found_rows();
#BUG#234321
select 2+23;
DROP TABLE t1;

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;