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

item_sum.cc, sql_select.cc:

After merge fix for bug#15560
item_sum.h:
   After merge fix for bug#15560


sql/sql_select.cc:
  After merge fix for bug#15560
sql/item_sum.h:
   After merge fix for bug#15560
sql/item_sum.cc:
  After merge fix for bug#15560
This commit is contained in:
unknown
2006-03-30 19:04:21 +04:00
parent e0708e2c11
commit 321e7b22c3
3 changed files with 8 additions and 7 deletions

View File

@ -8669,8 +8669,9 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
create_tmp_field_for_schema(thd, item, table) :
create_tmp_field(thd, table, item, type, &copy_func,
tmp_from_field, group != 0,
not_all_columns || group != 0,
item->marker == 4, 0,
!force_copy_fields &&
(not_all_columns || group !=0),
item->marker == 4, force_copy_fields,
param->convert_blob_length);
if (!new_field)