← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/natural_join_column.cc

  • Committer: Monty Taylor
  • Date: 2010-06-02 22:35:45 UTC
  • mto: This revision was merged to the branch mainline in revision 1586.
  • Revision ID: mordred@inaugust.com-20100602223545-q8ekf9b40a85nwuf
Rearragned unittests into a single exe because of how we need to link it
(thanks lifeless)
Link with server symbols without needing to build a library.
Added an additional atomics test which tests whatever version of the atomics
lib the running platform would actually use.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/natural_join_column.cc
28
28
Natural_join_column::Natural_join_column(Field *field_param,
29
29
                                         TableList *tab)
30
30
{
31
 
  assert(tab->table == field_param->getTable());
 
31
  assert(tab->table == field_param->table);
32
32
  table_field= field_param;
33
33
  table_ref= tab;
34
34
  is_common= false;
66
66
    Test that TableList::db is the same as TableShare::db to
67
67
    ensure consistency. 
68
68
  */
69
 
  assert(!strcmp(table_ref->getSchemaName(), table_ref->table->getShare()->getSchemaName()));
70
 
 
71
 
  return table_ref->getSchemaName();
 
69
  assert(!strcmp(table_ref->db,
 
70
                 table_ref->table->getShare()->getSchemaName()));
 
71
  return table_ref->db;
72
72
}
73
73
 
74
74
} /* namespace drizzled */