Commit 1bbb8ecf authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 

into sinisa.nasamreza.org:/mnt/work/mysql-4.0
parents d05697c7 0db472dd

sql/sql_select.cc

+2 −2
Original line number Diff line number Diff line
@@ -639,8 +639,8 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, 
    DBUG_PRINT("info",("Creating tmp table"));

    thd->proc_info="Creating tmp table";



    join.tmp_table_param.hidden_field_count=(all_fields.elements-

					     fields.elements);

    join.tmp_table_param.hidden_field_count= 

      (all_fields.elements > fields.elements) ?   (all_fields.elements- fields.elements) : 0;

    if (!(tmp_table =

	  create_tmp_table(thd,&join.tmp_table_param,all_fields,

			   ((!simple_group && !procedure &&