Commit 13f1e40b authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/sql_select.cc:
  Auto merged
parents 6e133525 3a520a78

sql/sql_select.cc

+0 −1
Original line number Diff line number Diff line
@@ -13783,7 +13783,6 @@ count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields, 
  param->quick_group=1;

  while ((field=li++))

  {

    Item::Type type=field->type();

    Item::Type real_type= field->real_item()->type();

    if (real_type == Item::FIELD_ITEM)

      param->field_count++;