← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
21
21
#include <drizzled/field_iterator.h>
22
22
#include <drizzled/table_list.h>
23
23
#include <drizzled/session.h>
 
24
#include <drizzled/sql_lex.h>
24
25
#include <drizzled/table.h>
25
26
 
26
27
namespace drizzled
46
47
 
47
48
Item *Field_iterator_table::create_item(Session *session)
48
49
{
49
 
  Select_Lex *select= session->getLex()->current_select;
50
 
 
51
 
  Item_field *item= new Item_field(session, &select->context, *ptr);
52
 
 
53
 
  return item;
 
50
  return new Item_field(session, &session->lex().current_select->context, *ptr);
54
51
}
55
52
 
56
53
 
242
239
      must take care to mark when all fields are created/added.
243
240
    */
244
241
    if (!parent_table_ref &&
245
 
        add_table_ref->join_columns->elements == field_count)
 
242
        add_table_ref->join_columns->size() == field_count)
246
243
      add_table_ref->is_join_columns_complete= true;
247
244
  }
248
245