← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/key_field.cc

Use List::begin()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/key_field.cc
77
77
                                      uint32_t *and_level,
78
78
                                      vector<optimizer::SargableParam> &sargables)
79
79
{
80
 
  List<TableList>::iterator li(nested_join_table->getNestedJoin()->join_list);
81
 
  List<TableList>::iterator li2(nested_join_table->getNestedJoin()->join_list);
 
80
  List<TableList>::iterator li(nested_join_table->getNestedJoin()->join_list.begin());
 
81
  List<TableList>::iterator li2(nested_join_table->getNestedJoin()->join_list.begin());
82
82
  bool have_another= false;
83
83
  table_map tables= 0;
84
84
  TableList *table;
94
94
        /* It's a semi-join nest. Walk into it as if it wasn't a nest */
95
95
        have_another= true;
96
96
        li2= li;
97
 
        li= List<TableList>::iterator(table->getNestedJoin()->join_list);
 
97
        li= List<TableList>::iterator(table->getNestedJoin()->join_list.begin());
98
98
      }
99
99
      else
100
100
        add_key_fields_for_nj(join, table, end, and_level, sargables);
425
425
{
426
426
  if (cond->type() == Item_func::COND_ITEM)
427
427
  {
428
 
    List<Item>::iterator li(*((Item_cond*) cond)->argument_list());
 
428
    List<Item>::iterator li(((Item_cond*) cond)->argument_list()->begin());
429
429
    optimizer::KeyField *org_key_fields= *key_fields;
430
430
 
431
431
    if (((Item_cond*) cond)->functype() == Item_func::COND_AND_FUNC)