← 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-08-02 18:35:08 UTC
  • mto: (1680.2.4 build)
  • mto: This revision was merged to the branch mainline in revision 1682.
  • Revision ID: mordred@inaugust.com-20100802183508-05993aozm52kae21
Removed inltool-update string warnings.

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>
43
43
 
44
44
Item *Natural_join_column::create_item(Session *session)
45
45
{
46
 
  return new Item_field(session, &session->getLex()->current_select->context, table_field);
 
46
  return new Item_field(session, &session->lex->current_select->context, table_field);
47
47
}
48
48
 
49
49
 
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 */