← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table/instance/base.cc

  • Committer: Olaf van der Spek
  • Date: 2011-10-10 10:13:51 UTC
  • mto: (2430.1.6 rf)
  • mto: This revision was merged to the branch mainline in revision 2436.
  • Revision ID: olafvdspek@gmail.com-20111010101351-hn3jvnsskpztl3jk
Use assign(), data() and size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
744
744
 
745
745
    if (! indx.has_comment())
746
746
    {
747
 
      keyinfo->comment.clear();
 
747
      keyinfo->comment.assign(NULL, 0);
748
748
    }
749
749
    else
750
750
    {
751
751
      keyinfo->flags|= HA_USES_COMMENT;
752
 
      keyinfo->comment.assign(mem().strdup(indx.comment(), indx.comment().length());
 
752
      keyinfo->comment.assign(mem().strdup(indx.comment()), indx.comment().length());
753
753
    }
754
754
 
755
755
    keyinfo->name= mem().strdup(indx.name());
982
982
    }
983
983
    else
984
984
    {
985
 
      comment.assign(mem().strdup(pfield.comment(), pfield.comment().size());
 
985
      comment.assign(mem().strdup(pfield.comment()), pfield.comment().size());
986
986
    }
987
987
 
988
988
    enum_field_types field_type;