← 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-07-07 13:41:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2385.
  • Revision ID: olafvdspek@gmail.com-20110707134107-6mi7pauiatxtf4oe
Rename strmake to strdup (standard name)

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table/instance/base.cc
529
529
    _path= identifier::Table::build_table_filename(db.str, table_name.str, false);
530
530
  }
531
531
 
532
 
  char* path_buff= mem_root.strmake(_path);
 
532
  char* path_buff= mem_root.strdup(_path);
533
533
  setPath(path_buff, _path.length());
534
534
  setNormalizedPath(path_buff, _path.length());
535
535
 
762
762
    {
763
763
      keyinfo->flags|= HA_USES_COMMENT;
764
764
      keyinfo->comment.length= indx.comment().length();
765
 
      keyinfo->comment.str= strmake(indx.comment().c_str(), keyinfo->comment.length);
 
765
      keyinfo->comment.str= strdup(indx.comment().c_str(), keyinfo->comment.length);
766
766
    }
767
767
 
768
 
    keyinfo->name= strmake(indx.name().c_str(), indx.name().length());
 
768
    keyinfo->name= strdup(indx.name().c_str(), indx.name().length());
769
769
 
770
770
    addKeyName(string(keyinfo->name, indx.name().length()));
771
771
  }
931
931
 
932
932
    for (int n= 0; n < field_options.field_value_size(); n++)
933
933
    {
934
 
      t->type_names[n]= strmake(field_options.field_value(n).c_str(), field_options.field_value(n).length());
 
934
      t->type_names[n]= strdup(field_options.field_value(n).c_str(), field_options.field_value(n).length());
935
935
 
936
936
      /* 
937
937
       * Go ask the charset what the length is as for "" length=1
1004
1004
      size_t len= pfield.comment().length();
1005
1005
      const char* str= pfield.comment().c_str();
1006
1006
 
1007
 
      comment.str= strmake(str, len);
 
1007
      comment.str= strdup(str, len);
1008
1008
      comment.length= len;
1009
1009
    }
1010
1010