hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DECIMAL conversion

Browse Source 
The DECIMAL type was not correctly converted to positive integers. The
0x80 bit was set only for negative numbers when it needed to be XOR-ed for
all values.
This commit is contained in:
Markus Mäkelä
2017-02-13 09:30:30 +02:00
parent 16ddefc686
commit 7a35ec71da
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/core/mysql_binlog.c
View File

@ -605,12 +605,11 @@ size_t unpack_decimal_field(uint8_t *ptr, uint8_t *metadata, double *val_float)
int fbytes = fpart1 * 4 + dig_bytes[fpart2]; int fbytes = fpart1 * 4 + dig_bytes[fpart2];
/** Remove the sign bit and store it locally */ /** Remove the sign bit and store it locally */
bool signed_int = (ptr[0] & 0x80); bool negative = (ptr[0] & 0x80) == 0;
ptr[0] ^= 0x80;
if (!signed_int) if (negative)
{ {
ptr[0] |= 0x80;
for (int i = 0; i < ibytes; i++) for (int i = 0; i < ibytes; i++)
{ {
ptr[i] = ~ptr[i]; ptr[i] = ~ptr[i];
@ -625,7 +624,7 @@ size_t unpack_decimal_field(uint8_t *ptr, uint8_t *metadata, double *val_float)
int64_t val_i = unpack_bytes(ptr, ibytes); int64_t val_i = unpack_bytes(ptr, ibytes);
int64_t val_f = fbytes ? unpack_bytes(ptr + ibytes, fbytes) : 0; int64_t val_f = fbytes ? unpack_bytes(ptr + ibytes, fbytes) : 0;
if (!signed_int) if (negative)
{ {
val_i = -val_i; val_i = -val_i;
val_f = -val_f; val_f = -val_f;