← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_delete_table.cc

Merge Stewart's dead code removal

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_delete_table.cc
19
19
 
20
20
#include "myisam_priv.h"
21
21
 
22
 
using namespace drizzled;
23
 
 
24
22
int mi_delete_table(const char *name)
25
23
{
26
24
  char from[FN_REFLEN];
27
25
 
28
 
  internal::fn_format(from,name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
29
 
  if (internal::my_delete_with_symlink(from, 0))
30
 
    return(errno);
31
 
  internal::fn_format(from,name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
32
 
  return(internal::my_delete_with_symlink(from, MYF(MY_WME)) ? errno : 0);
 
26
  fn_format(from,name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
 
27
  if (my_delete_with_symlink(from, 0))
 
28
    return(my_errno);
 
29
  fn_format(from,name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
 
30
  return(my_delete_with_symlink(from, MYF(MY_WME)) ? my_errno : 0);
33
31
}