← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: Brian Aker
  • Date: 2010-12-17 00:08:06 UTC
  • mfrom: (2002.1.4 clean)
  • Revision ID: brian@tangent.org-20101217000806-fa6kmggjnhsl4q85
Rollup for field encapsulation, monty fix for bzrignore, and Andrew bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.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) 2008 Sun Microsystems, Inc.
 
4
 *  Copyright (C) 2008 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/field_iterator.h>
22
22
#include <drizzled/table_list.h>
23
23
#include <drizzled/session.h>
46
46
 
47
47
Item *Field_iterator_table::create_item(Session *session)
48
48
{
49
 
  Select_Lex *select= session->getLex()->current_select;
 
49
  Select_Lex *select= session->lex->current_select;
50
50
 
51
51
  Item_field *item= new Item_field(session, &select->context, *ptr);
52
52
 
57
57
void Field_iterator_natural_join::set(TableList *table_ref)
58
58
{
59
59
  assert(table_ref->join_columns);
60
 
  column_ref_it= table_ref->join_columns->begin();
 
60
  column_ref_it.init(*(table_ref->join_columns));
61
61
  cur_column_ref= column_ref_it++;
62
62
}
63
63