database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

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

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


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2002-09-03 21:33:19 +03:00
parent 50a612f7cd af6a7eebe4
commit a0793f647a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@ -639,8 +639,8 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
DBUG_PRINT("info",("Creating tmp table")); DBUG_PRINT("info",("Creating tmp table"));
thd->proc_info="Creating tmp table"; thd->proc_info="Creating tmp table";
join.tmp_table_param.hidden_field_count=(all_fields.elements- join.tmp_table_param.hidden_field_count=
fields.elements); (all_fields.elements > fields.elements) ? (all_fields.elements- fields.elements) : 0;
if (!(tmp_table = if (!(tmp_table =
create_tmp_table(thd,&join.tmp_table_param,all_fields, create_tmp_table(thd,&join.tmp_table_param,all_fields,
((!simple_group && !procedure && ((!simple_group && !procedure &&