← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.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/table.cc
147
147
 
148
148
    share->path.str= path_buff;
149
149
    share->path.length= path_length;
150
 
    my_stpcpy(share->path.str, path);
 
150
    strcpy(share->path.str, path);
151
151
    share->normalized_path.str=    share->path.str;
152
152
    share->normalized_path.length= path_length;
153
153
 
370
370
 
371
371
    /* Unencoded 5.0 table name found */
372
372
    unpacked_path[length]= '\0'; // Remove .frm extension
373
 
    my_stpcpy(share->normalized_path.str, unpacked_path);
 
373
    strcpy(share->normalized_path.str, unpacked_path);
374
374
    share->normalized_path.length= length;
375
375
  }
376
376
 
589
589
    }
590
590
  }
591
591
  keynames=(char*) key_part;
592
 
  strpos+= (my_stpcpy(keynames, (char *) strpos) - keynames)+1;
 
592
  strpos+= (strcpy(keynames, (char*)strpos)+strlen((char*)strpos)-keynames)+1;
593
593
 
594
594
  //reading index comments
595
595
  for (keyinfo= share->key_info, i=0; i < keys; i++, keyinfo++)
3804
3804
    return(NULL);                               /* purecov: inspected */
3805
3805
  }
3806
3806
  param->items_to_copy= copy_func;
3807
 
  my_stpcpy(tmpname,path);
 
3807
  strcpy(tmpname,path);
3808
3808
  /* make table according to fields */
3809
3809
 
3810
3810
  memset(table, 0, sizeof(*table));