← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_delete_table.cc

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

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
 
22
24
int mi_delete_table(const char *name)
23
25
{
24
26
  char from[FN_REFLEN];
25
27
 
26
 
  fn_format(from,name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
27
 
  if (my_delete_with_symlink(from, 0))
 
28
  internal::fn_format(from,name,"",MI_NAME_IEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
 
29
  if (internal::my_delete_with_symlink(from, 0))
28
30
    return(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)) ? errno : 0);
 
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);
31
33
}