← 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-14 07:28:20 UTC
  • mfrom: (2436 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2438.
  • Revision ID: olafvdspek@gmail.com-20111014072820-nic6rljx3sg6bl9t
Merge trunk

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.length= 0;
748
 
      keyinfo->comment.str= NULL;
 
747
      keyinfo->comment.assign(NULL, 0);
749
748
    }
750
749
    else
751
750
    {
752
751
      keyinfo->flags|= HA_USES_COMMENT;
753
 
      keyinfo->comment.length= indx.comment().length();
754
 
      keyinfo->comment.str= mem().strdup(indx.comment());
 
752
      keyinfo->comment.assign(mem().strdup(indx.comment()), indx.comment().length());
755
753
    }
756
754
 
757
755
    keyinfo->name= mem().strdup(indx.name());
980
978
    lex_string_t comment;
981
979
    if (!pfield.has_comment())
982
980
    {
983
 
      comment.str= (char*)"";
984
 
      comment.length= 0;
 
981
      comment.assign("", 0);
985
982
    }
986
983
    else
987
984
    {
988
 
      comment.str= mem().strdup(pfield.comment());
989
 
      comment.length= pfield.comment().size();
 
985
      comment.assign(mem().strdup(pfield.comment()), pfield.comment().size());
990
986
    }
991
987
 
992
988
    enum_field_types field_type;