← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field_iterator.cc

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field_iterator.cc
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/table.h>
25
25
 
 
26
namespace drizzled
 
27
{
 
28
 
26
29
const char *Field_iterator_table::name()
27
30
{
28
31
  return (*ptr)->field_name;
281
284
  return nj_col;
282
285
}
283
286
 
 
287
} /* namespace drizzled */