← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/range.cc

  • Committer: Brian Aker
  • Date: 2011-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/range.cc
840
840
        optimizer::SEL_IMERGE *imerge= NULL;
841
841
        optimizer::TableReadPlan *best_conj_trp= NULL;
842
842
        optimizer::TableReadPlan *new_conj_trp= NULL;
843
 
        List<optimizer::SEL_IMERGE>::iterator it(tree->merges);
 
843
        List<optimizer::SEL_IMERGE>::iterator it(tree->merges.begin());
844
844
        while ((imerge= it++))
845
845
        {
846
846
          new_conj_trp= get_best_disjunct_quick(session, &param, imerge, best_read_time);
2565
2565
 
2566
2566
  if (cond->type() == Item::COND_ITEM)
2567
2567
  {
2568
 
    List<Item>::iterator li(*((Item_cond*) cond)->argument_list());
 
2568
    List<Item>::iterator li(((Item_cond*) cond)->argument_list()->begin());
2569
2569
 
2570
2570
    if (((Item_cond*) cond)->functype() == Item_func::COND_AND_FUNC)
2571
2571
    {
4599
4599
    return NULL;
4600
4600
 
4601
4601
  /* Analyze the query in more detail. */
4602
 
  List<Item>::iterator select_items_it(join->fields_list);
 
4602
  List<Item>::iterator select_items_it(join->fields_list.begin());
4603
4603
 
4604
4604
  /* Check (SA1,SA4) and store the only MIN/MAX argument - the C attribute.*/
4605
4605
  if (join->make_sum_func_list(join->all_fields, join->fields_list, 1))
5036
5036
  Item::Type cond_type= cond->type();
5037
5037
  if (cond_type == Item::COND_ITEM) /* 'AND' or 'OR' */
5038
5038
  {
5039
 
    List<Item>::iterator li(*((Item_cond*) cond)->argument_list());
 
5039
    List<Item>::iterator li(((Item_cond*) cond)->argument_list()->begin());
5040
5040
    Item *and_or_arg= NULL;
5041
5041
    while ((and_or_arg= li++))
5042
5042
    {