← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/sum.cc

  • Committer: Mark Atwood
  • Date: 2011-07-13 22:28:29 UTC
  • mfrom: (2318.7.25 refactor1)
  • Revision ID: me@mark.atwood.name-20110713222829-sswp061b5ts7tc1k
merge lp:~olafvdspek/drizzle/refactor1

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/sum.cc
1073
1073
  if (cond->type() == Item::COND_ITEM)
1074
1074
  {
1075
1075
    List<Item>::iterator li(((Item_cond*) cond)->argument_list()->begin());
1076
 
    Item *item;
1077
 
    while ((item= li++))
 
1076
    while (Item* item= li++)
1078
1077
    {
1079
1078
      if (maxmin_in_range(max_fl, field, item))
1080
 
      {
1081
1079
        return 1;
1082
 
      }
1083
1080
    }
1084
1081
    return 0;
1085
1082
  }
1120
1117
  case Item_func::EQ_FUNC:
1121
1118
  case Item_func::EQUAL_FUNC:
1122
1119
    break;
1123
 
  default:                                        // Keep compiler happy
1124
 
    assert(1);                               // Impossible
1125
 
    break;
 
1120
  default:
 
1121
    ; // assert(false); // Impossible; Olaf: Not really, assert is hit. BUG?
1126
1122
  }
1127
1123
  return 0;
1128
1124
}