← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/enum.cc

  • Committer: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

Show diffs side-by-side

added added

removed removed

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