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
This commit is contained in:
commit
13f1e40b7e
@ -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++;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user