~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: Brian Aker
  • Date: 2009-01-07 09:27:07 UTC
  • Revision ID: brian@tangent.org-20090107092707-bn67qpdllfcyh3j9
Removing dead field translator code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
79
79
  */
80
80
  if (table_ref->is_join_columns_complete)
81
81
  {
82
 
    /* Necesary, but insufficient conditions. */
83
 
    assert(table_ref->is_natural_join ||
84
 
                table_ref->nested_join ||
85
 
                ((table_ref->join_columns && /* This is a merge view. */
86
 
                  (table_ref->field_translation &&
87
 
                   table_ref->join_columns->elements ==
88
 
                   (ulong)(table_ref->field_translation_end -
89
 
                           table_ref->field_translation))) ||
90
 
                 /* This is stored table or a tmptable view. */
91
 
                 (!table_ref->field_translation &&
92
 
                  table_ref->join_columns->elements ==
93
 
                  table_ref->table->s->fields)));
94
82
    field_it= &natural_join_it;
95
83
  }
96
84
  /* This is a base table or stored view. */