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

Fix for verification tests: truncation of post digits should not return an error

Browse Source
This commit is contained in:
georg@lmy002.wdf.sap.corp 2005-04-11 12:25:44 +02:00
parent dbae73bfa8
commit 698399dc98
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libmysql/libmysql.c
View File

@ -3656,6 +3656,7 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
} }
} }
#define MY_TRUNC(val) (val < 0 ? - floor(-val) : floor(val))
/* /*
Convert double/float column to supplied buffer of any type. Convert double/float column to supplied buffer of any type.
@ -3688,7 +3689,7 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
*buffer= (uint8) value; *buffer= (uint8) value;
else else
*buffer= (int8) value; *buffer= (int8) value;
*param->error= value != (param->is_unsigned ? (double) ((uint8) *buffer) : *param->error= MY_TRUNC(value) != (param->is_unsigned ? (double) ((uint8) *buffer) :
(double) ((int8) *buffer)); (double) ((int8) *buffer));
break; break;
case MYSQL_TYPE_SHORT: case MYSQL_TYPE_SHORT:
@ -3702,7 +3703,7 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
short data= (short) value; short data= (short) value;
shortstore(buffer, data); shortstore(buffer, data);
} }
*param->error= value != (param->is_unsigned ? (double) (*(ushort*) buffer): *param->error= MY_TRUNC(value) != (param->is_unsigned ? (double) (*(ushort*) buffer):
(double) (*(short*) buffer)); (double) (*(short*) buffer));
break; break;
case MYSQL_TYPE_LONG: case MYSQL_TYPE_LONG:
@ -3716,7 +3717,7 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
int32 data= (int32) value; int32 data= (int32) value;
longstore(buffer, data); longstore(buffer, data);
} }
*param->error= value != (param->is_unsigned ? (double) (*(uint32*) buffer): *param->error= MY_TRUNC(value) != (param->is_unsigned ? (double) (*(uint32*) buffer):
(double) (*(int32*) buffer)); (double) (*(int32*) buffer));
break; break;
case MYSQL_TYPE_LONGLONG: case MYSQL_TYPE_LONGLONG:
@ -3730,7 +3731,7 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
longlong data= (longlong) value; longlong data= (longlong) value;
longlongstore(buffer, data); longlongstore(buffer, data);
} }
*param->error= value != (param->is_unsigned ? *param->error= MY_TRUNC(value) != (param->is_unsigned ?
ulonglong2double(*(ulonglong*) buffer) : ulonglong2double(*(ulonglong*) buffer) :
(double) (*(longlong*) buffer)); (double) (*(longlong*) buffer));
break; break;