1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Make sure to clean up temporary files in myisampack even when the

-T option is used. (Bug #12235)
This commit is contained in:
jimw@mysql.com
2005-08-12 11:44:25 -07:00
parent 61a9bace12
commit f693d22bb1

View File

@@ -609,14 +609,22 @@ static int compress(PACK_MRG_INFO *mrg,char *result_table)
else else
error=my_rename(new_name,org_name,MYF(MY_WME)); error=my_rename(new_name,org_name,MYF(MY_WME));
if (!error) if (!error)
{
VOID(my_copystat(temp_name,org_name,MYF(MY_COPYTIME))); VOID(my_copystat(temp_name,org_name,MYF(MY_COPYTIME)));
if (tmp_dir[0])
VOID(my_delete(new_name,MYF(MY_WME)));
}
} }
} }
else else
{ {
if (tmp_dir[0]) if (tmp_dir[0])
{
error=my_copy(new_name,org_name, error=my_copy(new_name,org_name,
MYF(MY_WME | MY_HOLD_ORIGINAL_MODES | MY_COPYTIME)); MYF(MY_WME | MY_HOLD_ORIGINAL_MODES | MY_COPYTIME));
if (!error)
VOID(my_delete(new_name,MYF(MY_WME)));
}
else else
error=my_redel(org_name,new_name,MYF(MY_WME | MY_COPYTIME)); error=my_redel(org_name,new_name,MYF(MY_WME | MY_COPYTIME));
} }