← 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: Brian Aker
  • Date: 2010-05-27 01:25:56 UTC
  • mfrom: (1567.1.4 new-staging)
  • Revision ID: brian@gaz-20100527012556-5zgkirkl7swbigd6
Merge of Brian, Paul. PBXT compile issue, and test framework cleanup. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_delete_table.cc
17
17
  deletes a table
18
18
*/
19
19
 
20
 
#include "myisamdef.h"
 
20
#include "myisam_priv.h"
 
21
 
 
22
using namespace drizzled;
21
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, MYF(MY_WME)))
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);
 
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);
31
33
}