Commit 1967d342 authored by gluh@eagle.(none)'s avatar gluh@eagle.(none)

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
parents e5bd4308 b3cb8466
...@@ -13783,7 +13783,6 @@ count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields, ...@@ -13783,7 +13783,6 @@ count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields,
param->quick_group=1; param->quick_group=1;
while ((field=li++)) while ((field=li++))
{ {
Item::Type type=field->type();
Item::Type real_type= field->real_item()->type(); Item::Type real_type= field->real_item()->type();
if (real_type == Item::FIELD_ITEM) if (real_type == Item::FIELD_ITEM)
param->field_count++; param->field_count++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment