1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50

Browse Source 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
This commit is contained in:
tsmith@ramayana.hindu.god 2007-10-17 11:23:04 -06:00
commit 9727b6dcac
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libmysql/libmysql.c
View File

@ -3873,7 +3873,9 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
sprintf(buff, "%.*f", (int) field->decimals, value); sprintf(buff, "%.*f", (int) field->decimals, value);
end= strend(buff); end= strend(buff);
} }
uint length= (uint) (end-buff);
{
size_t length= end - buff;
if (field->flags & ZEROFILL_FLAG && length < field->length && if (field->flags & ZEROFILL_FLAG && length < field->length &&
field->length < MAX_DOUBLE_STRING_REP_LENGTH - 1) field->length < MAX_DOUBLE_STRING_REP_LENGTH - 1)
{ {
@ -3882,6 +3884,8 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
length= field->length; length= field->length;
} }
fetch_string_with_conversion(param, buff, length); fetch_string_with_conversion(param, buff, length);
}
break; break;
} }
} }