← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/field.cc

  • Committer: Mark Atwood
  • Date: 2011-06-24 02:13:02 UTC
  • mfrom: (2318.6.56 rf)
  • Revision ID: me@mark.atwood.name-20110624021302-y9oiksid220xan9s
merge lp:~olafvdspek/drizzle/refactor14

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/field.cc
34
34
 
35
35
#include <boost/dynamic_bitset.hpp>
36
36
 
37
 
namespace drizzled
38
 
{
 
37
namespace drizzled {
39
38
 
40
39
/**
41
40
  Store the pointer to this item field into a list if not already there.
63
62
  while ((curr_item= item_list_it++))
64
63
  {
65
64
    if (curr_item->eq(this, 1))
66
 
      return(false); /* Already in the set. */
 
65
      return false; /* Already in the set. */
67
66
  }
68
67
  item_list->push_back(this);
69
 
  return(false);
 
68
  return false;
70
69
}
71
70
 
72
71
 
1197
1196
    res= field_conv(to,result_field);
1198
1197
    null_value=0;
1199
1198
  }
1200
 
  return(res);
 
1199
  return res;
1201
1200
}
1202
1201
 
1203
1202