← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Olaf van der Spek
  • Date: 2011-06-21 17:27:41 UTC
  • mto: This revision was merged to the branch mainline in revision 2346.
  • Revision ID: olafvdspek@gmail.com-20110621172741-j5tax0rcavbkj0yi
Refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
635
635
        for (uint32_t i= 0; (tmp= int_it++); i++)
636
636
        {
637
637
          uint32_t lengthsp;
638
 
          if (String::needs_conversion(tmp->length(), tmp->charset(),
639
 
                                       cs, &dummy))
 
638
          if (String::needs_conversion(tmp->length(), tmp->charset(), cs, &dummy))
640
639
          {
641
640
            conv.copy(tmp->ptr(), tmp->length(), cs);
642
 
            interval->type_names[i]= session->mem_root->strmake(conv.ptr(), conv.length());
 
641
            interval->type_names[i]= session->mem.strmake(conv);
643
642
            interval->type_lengths[i]= conv.length();
644
643
          }
645
644