Commit 9af776c8 authored by unknown's avatar unknown
Browse files

Cleanup

parent 6c82fa80

mysql-test/t/count_distinct2.test

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ select count(distinct n) from t1; 
show status like 'Created_tmp_disk_tables';

drop table t1;



#test conversion from heap to MyISAM

# Test use of MyISAM tmp tables

create table t1 (s text);

let $1=5000;

disable_query_log;

sql/item_sum.cc

+4 −4
Original line number Diff line number Diff line
@@ -2228,14 +2228,14 @@ bool Item_sum_count_distinct::setup(THD *thd) 
    return FALSE;



  if (!(tmp_table_param= new TMP_TABLE_PARAM))

    return 1;

    return TRUE;



  /* Create a table with an unique key over all parameters */

  for (uint i=0; i < arg_count ; i++)

  {

    Item *item=args[i];

    if (list.push_back(item))

      return 1;					// End of memory

      return TRUE;                              // End of memory

    if (item->const_item())

    {

      (void) item->val_int();
@@ -2244,14 +2244,14 @@ bool Item_sum_count_distinct::setup(THD *thd) 
    }

  }

  if (always_null)

    return 0;

    return FALSE;

  count_field_types(tmp_table_param,list,0);

  DBUG_ASSERT(table == 0);

  if (!(table= create_tmp_table(thd, tmp_table_param, list, (ORDER*) 0, 1,

				0,

				select_lex->options | thd->options,

				HA_POS_ERROR, (char*)"")))

    return 1;

    return TRUE;

  table->file->extra(HA_EXTRA_NO_ROWS);		// Don't update rows

  table->no_rows=1;