1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the result of a bad merge in storage/myisam/mi_delete_table.c in mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexey Kopytov 2010-04-04 09:52:04 +04:00
parent cab4a776d8
commit d7511181c5
1 changed files with 12 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
storage/myisam/mi_delete_table.c
View File

@ -19,41 +19,6 @@
#include "fulltext.h" #include "fulltext.h"
/**
Remove MyISAM data/index file safely
@details
If name is a symlink and file it is pointing to is not in
data directory, file is also removed.
@param name file to remove
@returns
0 on success or my_errno on failure
*/
static int _mi_safe_delete_file(const char *name)
{
DBUG_ENTER("_mi_safe_delete_file");
if (my_is_symlink(name) && (*myisam_test_invalid_symlink)(name))
{
/*
Symlink is pointing to file in data directory.
Remove symlink, keep file.
*/
if (my_delete(name, MYF(MY_WME)))
DBUG_RETURN(my_errno);
}
else
{
if (my_delete_with_symlink(name, MYF(MY_WME)))
DBUG_RETURN(my_errno);
}
DBUG_RETURN(0);
}
int mi_delete_table(const char *name) int mi_delete_table(const char *name)
{ {
char from[FN_REFLEN]; char from[FN_REFLEN];
@ -107,25 +72,24 @@ int mi_delete_table(const char *name)
if (mysql_file_delete_with_symlink(mi_key_file_kfile, from, MYF(MY_WME))) if (mysql_file_delete_with_symlink(mi_key_file_kfile, from, MYF(MY_WME)))
DBUG_RETURN(my_errno); DBUG_RETURN(my_errno);
} }
DBUG_RETURN(my_errno);
fn_format(from,name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT); fn_format(from,name,"",MI_NAME_DEXT,MY_UNPACK_FILENAME|MY_APPEND_EXT);
#ifdef USE_RAID #ifdef USE_RAID
if (raid_type) if (raid_type)
DBUG_RETURN(my_raid_delete(from, raid_chunks, MYF(MY_WME)) ? my_errno : 0); DBUG_RETURN(my_raid_delete(from, raid_chunks, MYF(MY_WME)) ? my_errno : 0);
#endif #endif
if (my_is_symlink(from) && (*myisam_test_invalid_symlink)(from)) if (my_is_symlink(from) && (*myisam_test_invalid_symlink)(from))
{ {
/* /*
Symlink is pointing to file in data directory. Symlink is pointing to file in data directory.
Remove symlink, keep file. Remove symlink, keep file.
*/ */
if (mysql_file_delete(mi_key_file_dfile, from, MYF(MY_WME))) if (mysql_file_delete(mi_key_file_dfile, from, MYF(MY_WME)))
DBUG_RETURN(my_errno); DBUG_RETURN(my_errno);
} }
else else
{ {
if (mysql_file_delete_with_symlink(mi_key_file_dfile, from, MYF(MY_WME))) if (mysql_file_delete_with_symlink(mi_key_file_dfile, from, MYF(MY_WME)))
DBUG_RETURN(my_errno); DBUG_RETURN(my_errno);
} }
DBUG_RETURN(0); DBUG_RETURN(0);
} }