mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 14:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge

Browse source
This commit is contained in:
Georgi Kodinov 2010-10-29 15:25:18 +03:00
commit 7de8306c19
353 changed files with 9758 additions and 3382 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sql/item_strfunc.cc
View file

@ -2313,7 +2313,8 @@ String *Item_func_format::val_str_ascii(String *str)
if (lc->grouping[0] > 0 &&
str_length >= dec_length + 1 + lc->grouping[0])
{
char buf[DECIMAL_MAX_STR_LENGTH * 2]; /* 2 - in the worst case when grouping=1 */
/* We need space for ',' between each group of digits as well. */
char buf[2 * FLOATING_POINT_BUFFER];
int count;
const char *grouping= lc->grouping;
char sign_length= *str->ptr() == '-' ? 1 : 0;
@ -2337,7 +2338,7 @@ String *Item_func_format::val_str_ascii(String *str)
count will be initialized to -1 and
we'll never get into this "if" anymore.
*/
if (!count)
if (count == 0)
{
*--dst= lc->thousand_sep;
if (grouping[1])