← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2009-03-05 08:26:07 UTC
  • mfrom: (910.2.11 mordred-noatomics)
  • Revision ID: brian@tangent.org-20090305082607-30deookk6sdycdeb
Merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
3589
3589
{
3590
3590
  bool error=0;
3591
3591
  handler *file;
3592
 
  char *ext;
3593
 
 
3594
 
  delete_table_proto_file(path);
3595
 
 
3596
 
  strcpy(ext= strchr(path, '\0'), reg_ext);
3597
 
  if (my_delete(path,MYF(0)))
 
3592
 
 
3593
  if(delete_table_proto_file(path))
3598
3594
    error=1; /* purecov: inspected */
3599
 
  *ext= 0;                              // remove extension
 
3595
 
3600
3596
  file= get_new_handler((TABLE_SHARE*) 0, current_session->mem_root, base);
3601
3597
  if (file && file->ha_delete_table(path))
3602
3598
  {
5953
5949
        uint32_t filePath_len= snprintf(filePath, sizeof(filePath),
5954
5950
                                        "%s%c%s", drizzle_tmpdir, FN_LIBCHAR,
5955
5951
                                        file->name);
5956
 
        if (!memcmp(reg_ext, ext, ext_len))
 
5952
        if (!memcmp(".dfe", ext, ext_len))
5957
5953
        {
5958
5954
          handler *handler_file= 0;
5959
5955
          /* We should cut file extention before deleting of table */