← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.cc

  • Committer: Lee Bieber
  • Date: 2011-02-20 02:08:06 UTC
  • mfrom: (2183.2.3 list)
  • Revision ID: kalebral@gmail.com-20110220020806-ad95ldlm2rfahrrr
Merge Olaf - change List_iterator_fast to List<Item>::iterator

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_list.cc
94
94
    */
95
95
    if ((cur_table_ref->outer_join & JOIN_TYPE_RIGHT))
96
96
    {
97
 
      List_iterator_fast<TableList> it(cur_nested_join->join_list);
 
97
      List<TableList>::iterator it(cur_nested_join->join_list);
98
98
      TableList *next;
99
99
      cur_table_ref= it++;
100
100
      while ((next= it++))
124
124
       cur_nested_join;
125
125
       cur_nested_join= cur_table_ref->nested_join)
126
126
  {
127
 
    List_iterator_fast<TableList> it(cur_nested_join->join_list);
 
127
    List<TableList>::iterator it(cur_nested_join->join_list);
128
128
    cur_table_ref= it++;
129
129
    /*
130
130
      If the current nested join is a RIGHT JOIN, the operands in