← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: Lee Bieber
  • Date: 2011-04-14 02:58:23 UTC
  • mfrom: (2275.2.5 typelib)
  • mto: This revision was merged to the branch mainline in revision 2278.
  • Revision ID: kalebral@gmail.com-20110414025823-vz32sg8fuxslygyd
Merge Olaf - remove unused functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
24
24
#include <drizzled/sql_lex.h>
25
25
#include <drizzled/table.h>
26
26
 
27
 
namespace drizzled
28
 
{
 
27
namespace drizzled {
29
28
 
30
29
const char *Field_iterator_table::name()
31
30
{
226
225
    if (!add_table_ref->join_columns)
227
226
    {
228
227
      /* Create a list of natural join columns on demand. */
229
 
      if (!(add_table_ref->join_columns= new List<Natural_join_column>))
230
 
        return NULL;
 
228
      add_table_ref->join_columns= new List<Natural_join_column>;
231
229
      add_table_ref->is_join_columns_complete= false;
232
230
    }
233
231
    add_table_ref->join_columns->push_back(nj_col);