Commit 739248f9 authored by unknown's avatar unknown
Browse files

item_cmpfunc.cc: 

  After merge fix


sql/item_cmpfunc.cc:
  After merge fix
parent ac2c480f

sql/item_cmpfunc.cc

+4 −0
Original line number Diff line number Diff line
@@ -179,6 +179,10 @@ static void agg_cmp_type(THD *thd, Item_result *type, Item **items, uint nitems) 
  for (i= 0; i < nitems ; i++)

  {

    Item_result result= items[i]->result_type();

    /*

      Use INT_RESULT as result type for DATE/TIME fields/functions and

      for constants successfully converted to DATE/TIME

    */

    if (field &&

         ((!items[i]->const_item() && items[i]->result_as_longlong()) ||

         (items[i]->const_item() && convert_constant_item(thd, field,