← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/varstring.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/varstring.cc
27
27
 
28
28
#include <string>
29
29
 
 
30
using namespace drizzled;
30
31
using namespace std;
31
32
 
32
33
/****************************************************************************
453
454
}
454
455
 
455
456
 
456
 
Field *Field_varstring::new_field(MEM_ROOT *root, Table *new_table, bool keep_type)
 
457
Field *Field_varstring::new_field(memory::Root *root, Table *new_table, bool keep_type)
457
458
{
458
459
  Field_varstring *res= (Field_varstring*) Field::new_field(root, new_table,
459
460
                                                            keep_type);
463
464
}
464
465
 
465
466
 
466
 
Field *Field_varstring::new_key_field(MEM_ROOT *root,
 
467
Field *Field_varstring::new_key_field(memory::Root *root,
467
468
                                      Table *new_table,
468
469
                                      unsigned char *new_ptr, unsigned char *new_null_ptr,
469
470
                                      uint32_t new_null_bit)