diff options
author | Ingo Struewing <ingo.struewing@sun.com> | 2009-09-30 12:30:09 +0200 |
---|---|---|
committer | Ingo Struewing <ingo.struewing@sun.com> | 2009-09-30 12:30:09 +0200 |
commit | 309ffb8b13f0fd035748a940f39f96011e58873b (patch) | |
tree | 4adfdc1d8d25271f843e0f702cc77bceb242b70f /sql-common/client.c | |
parent | 1e87babb1914c288df06a2dd9c8c4e96c70380df (diff) | |
parent | b3886f46da6278b511de9f07cbfa884ef09e18bb (diff) | |
download | mariadb-git-309ffb8b13f0fd035748a940f39f96011e58873b.tar.gz |
auto-merge
Diffstat (limited to 'sql-common/client.c')
-rw-r--r-- | sql-common/client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 1c0262f3414..3ee6c600387 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1350,7 +1350,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, field->flags= uint2korr(pos+7); field->decimals= (uint) pos[9]; - if (INTERNAL_NUM_FIELD(field)) + if (IS_NUM(field->type)) field->flags|= NUM_FLAG; if (default_value && row->data[7]) { @@ -1391,7 +1391,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, field->flags= (uint) (uchar) row->data[4][0]; field->decimals=(uint) (uchar) row->data[4][1]; } - if (INTERNAL_NUM_FIELD(field)) + if (IS_NUM(field->type)) field->flags|= NUM_FLAG; if (default_value && row->data[5]) { |