database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/my/mysql-4.0

Browse Source 
into  mysql.com:/home/my/mysql-4.1


client/mysqlimport.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/item_cmpfunc.cc:
  merge (keep old code)
sql/sql_handler.cc:
  manual merge
This commit is contained in:
unknown
2006-01-08 19:07:49 +02:00
parent f577d864cd 2dcedd9cbc
commit 13c27a9704
2 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_select.cc
View File

@ -5292,7 +5292,14 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
*(reg_field++) =new_field;
}
if (!--hidden_field_count)
{
hidden_null_count=null_count;
/*
We need to update hidden_field_count as we may have stored group
functions with constant arguments
*/
param->hidden_field_count= (uint) (reg_field - table->field);
}
}
DBUG_ASSERT(field_count >= (uint) (reg_field - table->field));
field_count= (uint) (reg_field - table->field);
@ -5488,7 +5495,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
}
}
if (distinct)
if (distinct && field_count != param->hidden_field_count)
{
/*
Create an unique key or an unique constraint over all columns