← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/unireg.cc

  • Committer: Eric Herman
  • Date: 2008-12-06 22:37:37 UTC
  • mfrom: (656.1.6 devel)
  • mto: (656.1.8 devel)
  • mto: This revision was merged to the branch mainline in revision 665.
  • Revision ID: eric@mysql.com-20081206223737-viem01l5uhm0w14r
merged from lp:drizzle/mordred

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/unireg.cc
794
794
  *pos++=(unsigned char) NAMES_SEP_CHAR;
795
795
  for (key=keyinfo ; key != end ; key++)
796
796
  {
797
 
    unsigned char *tmp=(unsigned char*) my_stpcpy((char*) pos,key->name);
 
797
    unsigned char *tmp=(unsigned char*) strcpy((char*) pos,key->name);
 
798
    tmp+= strlen(key->name);
798
799
    *tmp++= (unsigned char) NAMES_SEP_CHAR;
799
800
    *tmp=0;
800
801
    pos=tmp;
1099
1100
  it.rewind();
1100
1101
  while ((field=it++))
1101
1102
  {
1102
 
    char *pos= my_stpcpy((char*) buff,field->field_name);
 
1103
    char *pos= strcpy((char*) buff,field->field_name);
 
1104
    pos+= strlen(field->field_name);
1103
1105
    *pos++=NAMES_SEP_CHAR;
1104
1106
    if (i == create_fields.elements-1)
1105
1107
      *pos++=0;