← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/cmpfunc.h

  • Committer: Monty Taylor
  • Date: 2010-11-25 01:53:19 UTC
  • mto: (1953.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1955.
  • Revision ID: mordred@inaugust.com-20101125015319-ia85msn25uemopgc
Re-enabled -Wformat and then cleaned up the carnage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/cmpfunc.h
1150
1150
  Item_result cmp_type;
1151
1151
  DTCollation cmp_collation;
1152
1152
  enum_field_types cached_field_type;
1153
 
  cmp_item *cmp_items[DECIMAL_RESULT+1]; /* For all result types */
 
1153
  cmp_item *cmp_items[5]; /* For all result types */
1154
1154
  cmp_item *case_item;
1155
1155
public:
1156
1156
  Item_func_case(List<Item> &list, Item *first_expr_arg, Item *else_expr_arg)
1235
1235
  uint32_t decimal_precision() const { return 1; }
1236
1236
  void cleanup()
1237
1237
  {
 
1238
    uint32_t i;
1238
1239
    Item_int_func::cleanup();
1239
1240
    delete array;
1240
1241
    array= 0;
1241
 
    for (int i= STRING_RESULT; i <= DECIMAL_RESULT; i++)
 
1242
    for (i= 0; i <= (uint32_t)DECIMAL_RESULT + 1; i++)
1242
1243
    {
1243
1244
      delete cmp_items[i];
1244
1245
      cmp_items[i]= 0;