database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into deer.(none):/home/hf/work/mysql-4.0.628
This commit is contained in:
hf@deer.(none)
2003-07-03 16:50:17 +05:00
parent f259f379e4 95d6b7a5ea
commit eb7ab936bf
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/func_misc.result
View File

@ -13,3 +13,6 @@ NULL 255.255.1.255 0.0.1.255
select length(format('nan', 2)) > 0;
length(format('nan', 2)) > 0
1
select concat("$",format(2500,2));
concat("$",format(2500,2))
$2,500.00

5
mysql-test/t/func_misc.test
View File

@ -12,3 +12,8 @@ select inet_ntoa(1099511627775),inet_ntoa(4294902271),inet_ntoa(511);
# Test for core dump with nan
#
select length(format('nan', 2)) > 0;
#
# Test for bug #628
#
select concat("$",format(2500,2));

2
sql/item_strfunc.cc
View File

@ -1483,7 +1483,7 @@ String *Item_func_format::val_str(String *str)
str= copy_if_not_alloced(&tmp_str,str,length);
str->length(length);
tmp= (char*) str->ptr()+length - dec-1;
for (pos= (char*) str->ptr()+length ; pos != tmp; pos--)
for (pos= (char*) str->ptr()+length-1; pos != tmp; pos--)
pos[0]= pos[-(int) diff];
while (diff)
{