← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/natural_join_column.cc

  • Committer: Brian Aker
  • Date: 2010-01-22 00:53:13 UTC
  • Revision ID: brian@gaz-20100122005313-jmizcbcdi1lt4tcx
Revert db patch.

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
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
#include <drizzled/natural_join_column.h>
22
22
#include <drizzled/table_list.h>
23
23
#include <drizzled/session.h>
24
24
 
25
 
namespace drizzled
26
 
{
27
 
 
28
25
Natural_join_column::Natural_join_column(Field *field_param,
29
26
                                         TableList *tab)
30
27
{
31
 
  assert(tab->table == field_param->getTable());
 
28
  assert(tab->table == field_param->table);
32
29
  table_field= field_param;
33
30
  table_ref= tab;
34
31
  is_common= false;
43
40
 
44
41
Item *Natural_join_column::create_item(Session *session)
45
42
{
46
 
  return new Item_field(session, &session->getLex()->current_select->context, table_field);
 
43
  return new Item_field(session, &session->lex->current_select->context, table_field);
47
44
}
48
45
 
49
46
 
66
63
    Test that TableList::db is the same as TableShare::db to
67
64
    ensure consistency. 
68
65
  */
69
 
  assert(!strcmp(table_ref->getSchemaName(), table_ref->table->getShare()->getSchemaName()));
70
 
 
71
 
  return table_ref->getSchemaName();
 
66
  assert(!strcmp(table_ref->db,
 
67
                      table_ref->table->s->db.str));
 
68
  return table_ref->db;
72
69
}
73
 
 
74
 
} /* namespace drizzled */