diff options
| author | ramil@mysql.com <> | 2005-03-09 18:33:01 +0400 |
|---|---|---|
| committer | ramil@mysql.com <> | 2005-03-09 18:33:01 +0400 |
| commit | 2b1c712d53d44a594e045f4c6e112e15e9c6c291 (patch) | |
| tree | c5e272398322cb5c601464d50e629f88af6bb9fe | |
| parent | ca336ad1def1a88d03fdbd167ad456b7ff6dd972 (diff) | |
| download | mariadb-git-2b1c712d53d44a594e045f4c6e112e15e9c6c291.tar.gz | |
a fix (bug #7205: "archive" test fails on UnixWare when using prepared statements)
| -rw-r--r-- | sql/handler.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 9077622dd8c..7cb0ba3bee2 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -55,8 +55,6 @@ /* static functions defined in this file */ -static int NEAR_F delete_file(const char *name,const char *ext,int extflag); - static SHOW_COMP_OPTION have_yes= SHOW_OPTION_YES; /* list of all available storage engines (of their handlertons) */ @@ -1585,17 +1583,19 @@ uint handler::get_dup_key(int error) RETURN 0 If we successfully deleted at least one file from base_ext and didn't get any other errors than ENOENT - # Error from delete_file() + # Error */ int handler::delete_table(const char *name) { int error= 0; int enoent_or_zero= ENOENT; // Error if no file was deleted + char buff[FN_REFLEN]; for (const char **ext=bas_ext(); *ext ; ext++) { - if (delete_file(name,*ext,2)) + fn_format(buff, name, "", *ext, 2 | 4); + if (my_delete_with_symlink(buff, MYF(0))) { if ((error= my_errno) != ENOENT) break; @@ -1766,13 +1766,6 @@ err_end: DBUG_RETURN(error); } -static int NEAR_F delete_file(const char *name,const char *ext,int extflag) -{ - char buff[FN_REFLEN]; - VOID(fn_format(buff,name,"",ext,extflag | 4)); - return(my_delete_with_symlink(buff,MYF(MY_WME))); -} - void st_ha_check_opt::init() { flags= sql_flags= 0; |