← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/natural_join_column.cc

Merge Stewart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/natural_join_column.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2009 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2009 Sun Microsystems
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
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->s->db.str));
 
71
  return table_ref->db;
72
72
}
73
73
 
74
74
} /* namespace drizzled */