← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Mark Atwood
  • Date: 2011-06-22 20:04:22 UTC
  • mfrom: (2318.6.39 rf)
  • Revision ID: me@mark.atwood.name-20110622200422-609npl456o0e5p32
merge lp:~olafvdspek/drizzle/refactor13

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
772
772
    {
773
773
      keyinfo->flags|= HA_USES_COMMENT;
774
774
      keyinfo->comment.length= indx.comment().length();
775
 
      keyinfo->comment.str= strmake_root(indx.comment().c_str(), keyinfo->comment.length);
 
775
      keyinfo->comment.str= strmake(indx.comment().c_str(), keyinfo->comment.length);
776
776
    }
777
777
 
778
 
    keyinfo->name= strmake_root(indx.name().c_str(), indx.name().length());
 
778
    keyinfo->name= strmake(indx.name().c_str(), indx.name().length());
779
779
 
780
780
    addKeyName(string(keyinfo->name, indx.name().length()));
781
781
  }
941
941
 
942
942
    for (int n= 0; n < field_options.field_value_size(); n++)
943
943
    {
944
 
      t->type_names[n]= strmake_root(field_options.field_value(n).c_str(), field_options.field_value(n).length());
 
944
      t->type_names[n]= strmake(field_options.field_value(n).c_str(), field_options.field_value(n).length());
945
945
 
946
946
      /* 
947
947
       * Go ask the charset what the length is as for "" length=1
1014
1014
      size_t len= pfield.comment().length();
1015
1015
      const char* str= pfield.comment().c_str();
1016
1016
 
1017
 
      comment.str= strmake_root(str, len);
 
1017
      comment.str= strmake(str, len);
1018
1018
      comment.length= len;
1019
1019
    }
1020
1020