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 | 1f49cf7409befeb2cb392f8615a69eb2d530ffe5 (patch) | |
tree | 4adfdc1d8d25271f843e0f702cc77bceb242b70f /sql-common | |
parent | 7dacca0ff0a3c28401500afc807b71ebe9e4594f (diff) | |
parent | 12e822039d5dde7eda9f701323ff3b7b6c36bc29 (diff) | |
download | mariadb-git-1f49cf7409befeb2cb392f8615a69eb2d530ffe5.tar.gz |
auto-merge
Diffstat (limited to 'sql-common')
-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]) { |