← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.cc

  • Committer: Mark Atwood
  • Date: 2011-05-09 02:53:31 UTC
  • mfrom: (2281.6.2 prune)
  • Revision ID: me@mark.atwood.name-20110509025331-7gc89m3031ipwwf8
merge lp:~olafvdspek/drizzle/prune2

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/enum.cc
190
190
  uint32_t *len= typelib->type_lengths;
191
191
  for (const char **pos= typelib->type_names; *pos; pos++, len++)
192
192
  {
193
 
    size_t dummy_errors;
194
193
    if (flag)
195
194
      res.append(',');
196
195
    /* convert to res.charset() == utf8, then quote */
197
 
    enum_item.copy(*pos, *len, charset(), res.charset(), &dummy_errors);
 
196
    enum_item.copy(*pos, *len, res.charset());
198
197
    append_unescaped(&res, enum_item.c_ptr(), enum_item.length());
199
198
    flag= 1;
200
199
  }