← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.h

  • Committer: Brian Aker
  • Date: 2008-10-20 04:28:21 UTC
  • mto: (492.3.21 drizzle-clean-code)
  • mto: This revision was merged to the branch mainline in revision 530.
  • Revision ID: brian@tangent.org-20081020042821-rqqdrccuu8195k3y
Second pass of thd cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.h
57
57
  void next() { ptr++; }
58
58
  bool end_of_fields() { return *ptr == 0; }
59
59
  const char *name();
60
 
  Item *create_item(Session *thd);
 
60
  Item *create_item(Session *session);
61
61
  Field *field() { return *ptr; }
62
62
};
63
63
 
80
80
  void next();
81
81
  bool end_of_fields() { return !cur_column_ref; }
82
82
  const char *name() { return cur_column_ref->name(); }
83
 
  Item *create_item(Session *thd) { return cur_column_ref->create_item(thd); }
 
83
  Item *create_item(Session *session) { return cur_column_ref->create_item(session); }
84
84
  Field *field() { return cur_column_ref->field(); }
85
85
  Natural_join_column *column_ref() { return cur_column_ref; }
86
86
};
118
118
  const char *name() { return field_it->name(); }
119
119
  const char *table_name();
120
120
  const char *db_name();
121
 
  Item *create_item(Session *thd) { return field_it->create_item(thd); }
 
121
  Item *create_item(Session *session) { return field_it->create_item(session); }
122
122
  Field *field() { return field_it->field(); }
123
123
  Natural_join_column *get_or_create_column_ref(TableList *parent_table_ref);
124
124
  Natural_join_column *get_natural_column_ref();