Commit 4566d12f authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/jimw/my/mysql-4.1-clean
parents 3b1eabe8 4d0fad0d

myisam/myisampack.c

+8 −0
Original line number Diff line number Diff line
@@ -609,14 +609,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));

      }