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

Merge mysql.com:/home/jimw/my/mysql-4.1-12235

Browse Source 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
This commit is contained in:
unknown 2005-08-15 10:03:36 -07:00
commit 4566d12fb8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
myisam/myisampack.c
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));
} }