← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/natural_join_column.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

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->table);
 
31
  assert(tab->table == field_param->getTable());
32
32
  table_field= field_param;
33
33
  table_ref= tab;
34
34
  is_common= false;
67
67
    ensure consistency. 
68
68
  */
69
69
  assert(!strcmp(table_ref->db,
70
 
                 table_ref->table->s->getSchemaName()));
 
70
                 table_ref->table->getShare()->getSchemaName()));
71
71
  return table_ref->db;
72
72
}
73
73