← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.h

  • Committer: Brian Aker
  • Date: 2010-08-09 18:04:12 UTC
  • mfrom: (1689.3.7 staging)
  • Revision ID: brian@gaz-20100809180412-olurwh51ojllev6p
Merge in heap conversion, and case insensitive patch, and remove need for
M_HASH in session.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.h
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
21
21
#ifndef DRIZZLED_FIELD_ITERATOR_H
22
22
#define DRIZZLED_FIELD_ITERATOR_H
23
23
 
24
 
#include <drizzled/memory/sql_alloc.h>
 
24
#include "drizzled/memory/sql_alloc.h"
25
25
#include <drizzled/sql_list.h>
26
26
#include <drizzled/natural_join_column.h>
27
27
 
78
78
 
79
79
class Field_iterator_natural_join: public Field_iterator
80
80
{
81
 
  List<Natural_join_column>::iterator column_ref_it;
 
81
  List_iterator_fast<Natural_join_column> column_ref_it;
82
82
  Natural_join_column *cur_column_ref;
83
83
public:
84
84
  Field_iterator_natural_join() :cur_column_ref(NULL) {}