← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Mark Atwood
  • Date: 2011-07-13 22:28:29 UTC
  • mfrom: (2318.7.25 refactor1)
  • Revision ID: me@mark.atwood.name-20110713222829-sswp061b5ts7tc1k
merge lp:~olafvdspek/drizzle/refactor1

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
604
604
 
605
605
    if (sql_field->sql_type == DRIZZLE_TYPE_ENUM)
606
606
    {
607
 
      size_t dummy;
608
607
      const charset_info_st * const cs= sql_field->charset;
609
608
      TYPELIB *interval= sql_field->interval;
610
609
 
631
630
        for (uint32_t i= 0; (tmp= int_it++); i++)
632
631
        {
633
632
          uint32_t lengthsp;
634
 
          if (String::needs_conversion(tmp->length(), tmp->charset(), cs, &dummy))
 
633
          if (String::needs_conversion(tmp->length(), tmp->charset(), cs))
635
634
          {
636
635
            conv.copy(tmp->ptr(), tmp->length(), cs);
637
636
            interval->type_names[i]= session->mem.strmake(conv);