← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.cc

  • Committer: Monty Taylor
  • Date: 2009-12-30 18:44:00 UTC
  • mfrom: (1258 build)
  • mto: This revision was merged to the branch mainline in revision 1259.
  • Revision ID: mordred@inaugust.com-20091230184400-li96wztn438f0myn
Merged up with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.cc
29
29
#include <sstream>
30
30
#include <string>
31
31
 
 
32
using namespace drizzled;
 
33
 
32
34
/****************************************************************************
33
35
** enum type.
34
36
** This is a string which only can have a selection of different values.
265
267
  res.append(')');
266
268
}
267
269
 
268
 
Field *Field_enum::new_field(MEM_ROOT *root, Table *new_table,
 
270
Field *Field_enum::new_field(memory::Root *root, Table *new_table,
269
271
                             bool keep_type)
270
272
{
271
273
  Field_enum *res= (Field_enum*) Field::new_field(root, new_table, keep_type);