← 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-09-15 20:24:31 UTC
  • mto: (1766.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1767.
  • Revision ID: brian@tangent.org-20100915202431-wbrrl4vg6rzjvdiu
Adding opt for optional schedulers and making them --plugin-add only.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
128
128
  if (table_ref->is_natural_join)
129
129
    return natural_join_it.column_ref()->table_name();
130
130
 
131
 
  assert(!strcmp(table_ref->getTableName(),
132
 
                 table_ref->table->getShare()->getTableName()));
133
 
  return table_ref->getTableName();
 
131
  assert(!strcmp(table_ref->table_name,
 
132
                      table_ref->table->getShare()->getTableName()));
 
133
  return table_ref->table_name;
134
134
}
135
135
 
136
136
 
143
143
    Test that TableList::db is the same as TableShare::db to
144
144
    ensure consistency. 
145
145
  */
146
 
  assert(!strcmp(table_ref->getSchemaName(), table_ref->table->getShare()->getSchemaName()));
147
 
  return table_ref->getSchemaName();
 
146
  assert(!strcmp(table_ref->db, table_ref->table->getShare()->getSchemaName()));
 
147
  return table_ref->db;
148
148
}
149
149
 
150
150