← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 09:33:49 UTC
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329093349-oz4cgb9f7l1032m3
Fix Drizzle to compile in GCC 4.6 (which fires warnings and therefore errors if a variable is set and not read)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.cc
789
789
                                     int64_t *const_value)
790
790
{
791
791
  enum enum_date_cmp_type cmp_type= CMP_DATE_DFLT;
792
 
  Item *str_arg= 0, *date_arg= 0;
 
792
  Item *str_arg= 0;
793
793
 
794
794
  if (in_a->type() == Item::ROW_ITEM || in_b->type() == Item::ROW_ITEM)
795
795
    return CMP_DATE_DFLT;
803
803
    else if (in_b->result_type() == STRING_RESULT)
804
804
    {
805
805
      cmp_type= CMP_DATE_WITH_STR;
806
 
      date_arg= in_a;
807
806
      str_arg= in_b;
808
807
    }
809
808
  }
810
809
  else if (in_b->is_datetime() && in_a->result_type() == STRING_RESULT)
811
810
  {
812
811
    cmp_type= CMP_STR_WITH_DATE;
813
 
    date_arg= in_b;
814
812
    str_arg= in_a;
815
813
  }
816
814