← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/table.cc

  • Committer: Brian Aker
  • Date: 2008-07-11 16:46:57 UTC
  • Revision ID: brian@tangent.org-20080711164657-45weklayjvmpbr2u
Cleanup of warning/errors.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/table.cc
2951
2951
    /* Necesary, but insufficient conditions. */
2952
2952
    assert(table_ref->is_natural_join ||
2953
2953
                table_ref->nested_join ||
2954
 
                table_ref->join_columns &&
2955
 
                /* This is a merge view. */
2956
 
                ((table_ref->field_translation &&
2957
 
                  table_ref->join_columns->elements ==
2958
 
                  (ulong)(table_ref->field_translation_end -
2959
 
                          table_ref->field_translation)) ||
 
2954
                ((table_ref->join_columns && /* This is a merge view. */ (table_ref->field_translation && table_ref->join_columns->elements == (ulong)(table_ref->field_translation_end - table_ref->field_translation))) ||
2960
2955
                 /* This is stored table or a tmptable view. */
2961
 
                 (!table_ref->field_translation &&
2962
 
                  table_ref->join_columns->elements ==
2963
 
                  table_ref->table->s->fields)));
 
2956
                 (!table_ref->field_translation && table_ref->join_columns->elements == table_ref->table->s->fields)));
2964
2957
    field_it= &natural_join_it;
2965
2958
  }
2966
2959
  /* This is a base table or stored view. */