← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.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/sql_base.cc
1929
1929
                           const char *name, uint32_t , Item **,
1930
1930
                           bool, TableList **actual_table)
1931
1931
{
1932
 
  List_iterator_fast<Natural_join_column>
 
1932
  List<Natural_join_column>::iterator
1933
1933
    field_it(*(table_ref->join_columns));
1934
1934
  Natural_join_column *nj_col, *curr_nj_col;
1935
1935
  Field *found_field;
2981
2981
  if (using_fields && found_using_fields < using_fields->elements)
2982
2982
  {
2983
2983
    String *using_field_name;
2984
 
    List_iterator_fast<String> using_fields_it(*using_fields);
 
2984
    List<String>::iterator using_fields_it(*using_fields);
2985
2985
    while ((using_field_name= using_fields_it++))
2986
2986
    {
2987
2987
      const char *using_field_name_ptr= using_field_name->c_ptr();
2988
 
      List_iterator_fast<Natural_join_column>
 
2988
      List<Natural_join_column>::iterator
2989
2989
        it(*(natural_using_join->join_columns));
2990
2990
      Natural_join_column *common_field;
2991
2991
 
3068
3068
  /* Call the procedure recursively for each nested table reference. */
3069
3069
  if (table_ref->getNestedJoin())
3070
3070
  {
3071
 
    List_iterator_fast<TableList> nested_it(table_ref->getNestedJoin()->join_list);
 
3071
    List<TableList>::iterator nested_it(table_ref->getNestedJoin()->join_list);
3072
3072
    TableList *same_level_left_neighbor= nested_it++;
3073
3073
    TableList *same_level_right_neighbor= NULL;
3074
3074
    /* Left/right-most neighbors, possibly at higher levels in the join tree. */
3122
3122
  {
3123
3123
    assert(table_ref->getNestedJoin() &&
3124
3124
           table_ref->getNestedJoin()->join_list.elements == 2);
3125
 
    List_iterator_fast<TableList> operand_it(table_ref->getNestedJoin()->join_list);
 
3125
    List<TableList>::iterator operand_it(table_ref->getNestedJoin()->join_list);
3126
3126
    /*
3127
3127
      Notice that the order of join operands depends on whether table_ref
3128
3128
      represents a LEFT or a RIGHT join. In a RIGHT join, the operands are
3222
3222
  if (from_clause->elements == 0)
3223
3223
    return false; /* We come here in the case of UNIONs. */
3224
3224
 
3225
 
  List_iterator_fast<TableList> table_ref_it(*from_clause);
 
3225
  List<TableList>::iterator table_ref_it(*from_clause);
3226
3226
  TableList *table_ref; /* Current table reference. */
3227
3227
  /* Table reference to the left of the current. */
3228
3228
  TableList *left_neighbor;
3805
3805
bool
3806
3806
fill_record(Session *session, List<Item> &fields, List<Item> &values, bool ignore_errors)
3807
3807
{
3808
 
  List_iterator_fast<Item> f(fields),v(values);
 
3808
  List<Item>::iterator f(fields),v(values);
3809
3809
  Item *value;
3810
3810
  Item_field *field;
3811
3811
  Table *table;
3870
3870
 
3871
3871
bool fill_record(Session *session, Field **ptr, List<Item> &values, bool)
3872
3872
{
3873
 
  List_iterator_fast<Item> v(values);
 
3873
  List<Item>::iterator v(values);
3874
3874
  Item *value;
3875
3875
  Table *table= 0;
3876
3876
  Field *field;