Commit 43afb278 authored by unknown's avatar unknown
Browse files

Merge olga.mysql.com:/home/igor/mysql-5.0-opt 

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27229
parents 06e38d1d d95c307f

sql/item_sum.cc

+1 −2
Original line number Diff line number Diff line
@@ -449,7 +449,6 @@ void Item_sum::update_used_tables () 
    used_tables_cache&= PSEUDO_TABLE_BITS;



    /* the aggregate function is aggregated into its local context */

    if (aggr_level == nest_level)

    used_tables_cache |=  (1 << aggr_sel->join->tables) - 1;

  }

}

sql/sql_select.cc

+16 −10
Original line number Diff line number Diff line
@@ -9196,9 +9196,12 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, 
    Item::Type type=item->type();

    if (not_all_columns)

    {

      if (item->with_sum_func && type != Item::SUM_FUNC_ITEM &&

          (type == Item::SUBSELECT_ITEM ||

           (item->used_tables() & ~PSEUDO_TABLE_BITS)))

      if (item->with_sum_func && type != Item::SUM_FUNC_ITEM)

      {

        if (item->used_tables() & OUTER_REF_TABLE_BIT)

          item->update_used_tables();

        if (type == Item::SUBSELECT_ITEM ||

            (item->used_tables() & ~OUTER_REF_TABLE_BIT))

        {

	  /*

	    Mark that the we have ignored an item that refers to a summary
@@ -9208,6 +9211,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, 
	  param->using_indirect_summary_function=1;

	  continue;

        }

      }

      if (item->const_item() && (int) hidden_field_count <= 0)

        continue; // We don't have to store this

    }
@@ -9391,6 +9395,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, 
    table->s->default_values= table->record[1]+alloc_length;

  }

  copy_func[0]=0;				// End marker

  param->func_count= copy_func - param->items_to_copy; 



  recinfo=param->start_recinfo;

  null_flags=(uchar*) table->record[0];
@@ -13571,6 +13576,7 @@ count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields, 
	if (!sum_item->quick_group)

	  param->quick_group=0;			// UDF SUM function

	param->sum_func_count++;

        param->func_count++;



	for (uint i=0 ; i < sum_item->arg_count ; i++)

	{