← 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-09 20:51:34 UTC
  • mfrom: (1643.4.3 drizzle)
  • Revision ID: brian@gaz-20100709205134-ru4s0889youfrmm5
Merge of Patrick

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
 
129
129
    return natural_join_it.column_ref()->table_name();
130
130
 
131
131
  assert(!strcmp(table_ref->table_name,
132
 
                      table_ref->table->s->table_name.str));
 
132
                      table_ref->table->getShare()->getTableName()));
133
133
  return table_ref->table_name;
134
134
}
135
135
 
143
143
    Test that TableList::db is the same as TableShare::db to
144
144
    ensure consistency. 
145
145
  */
146
 
  assert(!strcmp(table_ref->db, table_ref->table->s->getSchemaName()));
 
146
  assert(!strcmp(table_ref->db, table_ref->table->getShare()->getSchemaName()));
147
147
  return table_ref->db;
148
148
}
149
149
 
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->s->fields;
 
203
    field_count= table_ref->table->getShare()->sizeFields();
204
204
  }
205
205
  else
206
206
  {