← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.cc

  • Committer: Brian Aker
  • Date: 2010-05-14 14:34:40 UTC
  • mfrom: (1530.1.3 staging)
  • Revision ID: brian@gaz-20100514143440-p7yyn7y6yxpqumf1
Rollup merge for typelib/tableshare cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.cc
215
215
  ASSERT_COLUMN_MARKED_FOR_READ;
216
216
 
217
217
  if (!tmp || tmp > typelib->count)
 
218
  {
218
219
    val_ptr->set("", 0, field_charset);
 
220
  }
219
221
  else
220
 
    val_ptr->set((const char*) typelib->type_names[tmp-1],
221
 
                 typelib->type_lengths[tmp-1],
222
 
                 field_charset);
 
222
  {
 
223
    val_ptr->set((const char*) typelib->type_names[tmp-1], typelib->type_lengths[tmp-1], field_charset);
 
224
  }
 
225
 
223
226
  return val_ptr;
224
227
}
225
228
 
273
276
{
274
277
  Field_enum *res= (Field_enum*) Field::new_field(root, new_table, keep_type);
275
278
  if (res)
 
279
  {
276
280
    res->typelib= copy_typelib(root, typelib);
 
281
  }
277
282
  return res;
278
283
}
279
284