← 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: 2010-12-02 22:51:54 UTC
  • mto: (1975.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 1976.
  • Revision ID: mordred@inaugust.com-20101202225154-h54ifmga9x6cckgs
Refactored syslog module and changed it to use sys_var directly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.cc
145
145
 
146
146
  ASSERT_COLUMN_MARKED_FOR_READ;
147
147
 
148
 
  if (not tmp || tmp > typelib->count)
 
148
  if (!tmp || tmp > typelib->count)
149
149
  {
150
150
    val_ptr->set("", 0, field_charset);
151
151
  }
208
208
  Field_enum *res= (Field_enum*) Field::new_field(root, new_table, keep_type);
209
209
  if (res)
210
210
  {
211
 
    res->typelib= typelib->copy_typelib(root);
 
211
    res->typelib= copy_typelib(root, typelib);
212
212
  }
213
213
  return res;
214
214
}