← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_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/sql_table.cc
520
520
        delete_table_proto_file(path);
521
521
 
522
522
        /* Delete the table definition file */
523
 
        my_stpcpy(end,reg_ext);
 
523
        strcpy(end,reg_ext);
524
524
        if (!(new_error=my_delete(path,MYF(MY_WME))))
525
525
        {
526
526
          some_tables_deleted=1;
2114
2114
  if (lower_case_table_names == 2 && file &&
2115
2115
      !(file->ha_table_flags() & HA_FILE_BASED))
2116
2116
  {
2117
 
    my_stpcpy(tmp_name, old_name);
 
2117
    strcpy(tmp_name, old_name);
2118
2118
    my_casedn_str(files_charset_info, tmp_name);
2119
2119
    build_table_filename(lc_from, sizeof(lc_from), old_db, tmp_name, "",
2120
2120
                         flags & FN_FROM_IS_TMP);
2121
2121
    from_base= lc_from;
2122
2122
 
2123
 
    my_stpcpy(tmp_name, new_name);
 
2123
    strcpy(tmp_name, new_name);
2124
2124
    my_casedn_str(files_charset_info, tmp_name);
2125
2125
    build_table_filename(lc_to, sizeof(lc_to), new_db, tmp_name, "",
2126
2126
                         flags & FN_TO_IS_TMP);
3713
3713
    if (create_info->index_file_name)
3714
3714
    {
3715
3715
      /* Fix index_file_name to have 'tmp_name' as basename */
3716
 
      my_stpcpy(index_file, tmp_name);
 
3716
      strcpy(index_file, tmp_name);
3717
3717
      create_info->index_file_name=fn_same(index_file,
3718
3718
                                           create_info->index_file_name,
3719
3719
                                           1);
3721
3721
    if (create_info->data_file_name)
3722
3722
    {
3723
3723
      /* Fix data_file_name to have 'tmp_name' as basename */
3724
 
      my_stpcpy(data_file, tmp_name);
 
3724
      strcpy(data_file, tmp_name);
3725
3725
      create_info->data_file_name=fn_same(data_file,
3726
3726
                                          create_info->data_file_name,
3727
3727
                                          1);
4464
4464
  /* Check that we are not trying to rename to an existing table */
4465
4465
  if (new_name)
4466
4466
  {
4467
 
    my_stpcpy(new_name_buff,new_name);
4468
 
    my_stpcpy(new_alias= new_alias_buff, new_name);
 
4467
    strcpy(new_name_buff,new_name);
 
4468
    strcpy(new_alias= new_alias_buff, new_name);
4469
4469
    if (lower_case_table_names)
4470
4470
    {
4471
4471
      if (lower_case_table_names != 2)
4472
4472
      {
4473
 
        my_casedn_str(files_charset_info, new_name_buff);
4474
 
        new_alias= new_name;                    // Create lower case table name
 
4473
        my_casedn_str(files_charset_info, new_name_buff);
 
4474
        new_alias= new_name;                    // Create lower case table name
4475
4475
      }
4476
4476
      my_casedn_str(files_charset_info, new_name);
4477
4477
    }