← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

merged with latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
34
34
 
35
35
void Field_iterator_table::set(TableList *table)
36
36
{
37
 
  ptr= table->table->field;
 
37
  ptr= table->table->getFields();
38
38
}
39
39
 
40
40
 
41
41
void Field_iterator_table::set_table(Table *table)
42
42
{
43
 
  ptr= table->field;
 
43
  ptr= table->getFields();
44
44
}
45
45
 
46
46
 
200
200
    /* The field belongs to a stored table. */
201
201
    Field *tmp_field= table_field_it.field();
202
202
    nj_col= new Natural_join_column(tmp_field, table_ref);
203
 
    field_count= table_ref->table->getShare()->fields;
 
203
    field_count= table_ref->table->getShare()->sizeFields();
204
204
  }
205
205
  else
206
206
  {