database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
This commit is contained in:
jimw@mysql.com
2005-08-15 12:37:45 -07:00
parent 8589f14d45 cd0f3596be
commit a3eaf4eec2
10 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
myisam/myisampack.c
View File

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