← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: Mark Atwood
  • Date: 2011-08-12 04:08:33 UTC
  • mfrom: (2385.2.17 refactor5)
  • Revision ID: me@mark.atwood.name-20110812040833-u6j85nc6ahuc0dtz
merge lp:~olafvdspek/drizzle/refactor5

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
26
26
 
27
27
namespace drizzled {
28
28
 
29
 
const char *Field_iterator_table::name()
 
29
const char *Field_iterator_table::name() const
30
30
{
31
31
  return (*ptr)->field_name;
32
32
}
264
264
Natural_join_column *
265
265
Field_iterator_table_ref::get_natural_column_ref()
266
266
{
267
 
  Natural_join_column *nj_col;
268
 
 
269
267
  assert(field_it == &natural_join_it);
270
268
  /*
271
269
    The field belongs to a NATURAL join, therefore the column reference was
272
270
    already created via one of the two constructor calls above. In this case
273
271
    we just return the already created column reference.
274
272
  */
275
 
  nj_col= natural_join_it.column_ref();
276
 
  assert(nj_col &&
277
 
              (!nj_col->table_field ||
278
 
               nj_col->table_ref->table == nj_col->table_field->getTable()));
 
273
  Natural_join_column* nj_col= natural_join_it.column_ref();
 
274
  assert(nj_col && (!nj_col->table_field || nj_col->table_ref->table == nj_col->table_field->getTable()));
279
275
  return nj_col;
280
276
}
281
277