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

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
1bbb8ecf · Sinisa@sinisa.nasamreza.org · d05697c7 · 0db472dd · 1bbb8ecf
Commit 1bbb8ecf authored Sep 03, 2002 by Sinisa@sinisa.nasamreza.org
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_select.cc sql/sql_select.cc +2 -2

No files found.
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -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 &&