← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: Brian Aker
  • Date: 2010-07-16 05:40:08 UTC
  • mto: This revision was merged to the branch mainline in revision 1661.
  • Revision ID: brian@gaz-20100716054008-cfcvyu0akpwqnwqd
Encapsulate Table in field

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
67
67
  cur_column_ref= column_ref_it++;
68
68
  assert(!cur_column_ref || ! cur_column_ref->table_field ||
69
69
              cur_column_ref->table_ref->table ==
70
 
              cur_column_ref->table_field->table);
 
70
              cur_column_ref->table_field->getTable());
71
71
}
72
72
 
73
73
 
215
215
    assert(nj_col);
216
216
  }
217
217
  assert(!nj_col->table_field ||
218
 
              nj_col->table_ref->table == nj_col->table_field->table);
 
218
              nj_col->table_ref->table == nj_col->table_field->getTable());
219
219
 
220
220
  /*
221
221
    If the natural join column was just created add it to the list of
280
280
  nj_col= natural_join_it.column_ref();
281
281
  assert(nj_col &&
282
282
              (!nj_col->table_field ||
283
 
               nj_col->table_ref->table == nj_col->table_field->table));
 
283
               nj_col->table_ref->table == nj_col->table_field->getTable()));
284
284
  return nj_col;
285
285
}
286
286