← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.h

  • Committer: Lee Bieber
  • Date: 2011-01-25 02:10:42 UTC
  • mfrom: (2109.1.4 build)
  • Revision ID: kalebral@gmail.com-20110125021042-ocqa0v509ae7fmtz
Need to add a "drop table a" in execute.wait test
Add execute test suite to regular test run
Merge Lee - fix second part of 705699, check for both client and server before building and testing rabbitmq plugin
Merge Shrews - Changes TransactionServices methods to use references to Session objects instead of pointers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.h
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) {}