Commit 3a44dcd1 authored by unknown's avatar unknown
Browse files

after merge fix/

parent 6b24a50d

sql/item_sum.cc

+2 −2
Original line number Diff line number Diff line
@@ -311,8 +311,8 @@ Field *Item_sum_hybrid::create_tmp_field(bool group, TABLE *table, 
  {

    Field *field= ((Item_field*) args[0])->field;

    

    if ((field= create_tmp_field_from_field(current_thd, field, this, table,

					    0, convert_blob_length)))

    if ((field= create_tmp_field_from_field(current_thd, field, name, table,

					    NULL, convert_blob_length)))

      field->flags&= ~NOT_NULL_FLAG;

    return field;

  }

sql/sql_select.h

+3 −4
Original line number Diff line number Diff line
@@ -402,9 +402,8 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param, 
			     int error, bool ignore_last_dupp_error);

uint find_shortest_key(TABLE *table, const key_map *usable_keys);

Field* create_tmp_field_from_field(THD *thd, Field* org_field,

				   Item *item, TABLE *table,

				   bool modify_item,

				   uint convert_blob_length);

                                   const char *name, TABLE *table,

                                   Item_field *item, uint convert_blob_length);

                                                                      

/* functions from opt_sum.cc */

bool simple_pred(Item_func *func_item, Item **args, bool *inv_order);