← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/natural_join_column.cc

  • Committer: Padraig O'Sullivan
  • Date: 2009-11-26 04:33:51 UTC
  • mto: (1228.4.1 push)
  • mto: This revision was merged to the branch mainline in revision 1234.
  • Revision ID: osullivan.padraig@gmail.com-20091126043351-2ebmuyzrbifxat0q
Removed all remnants of schema_table from the TableList class. This cleans up a bunch of code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/natural_join_column.cc
61
61
{
62
62
  /*
63
63
    Test that TableList::db is the same as TableShare::db to
64
 
    ensure consistency. An exception are I_S schema tables, which
65
 
    are inconsistent in this respect.
 
64
    ensure consistency. 
66
65
  */
67
66
  assert(!strcmp(table_ref->db,
68
 
                      table_ref->table->s->db.str) ||
69
 
              (table_ref->schema_table &&
70
 
               table_ref->table->s->db.str[0] == 0));
 
67
                      table_ref->table->s->db.str));
71
68
  return table_ref->db;
72
69
}