Commit fe9f7980 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/mysql-4.1.15428 

into  mysql.com:/home/hf/work/mysql-5.0-mrg


myisam/mi_check.c:
  Auto merged
mysys/my_chsize.c:
  Auto merged
parents 54bb1045 feb9cc2f

myisam/mi_check.c

+6 −3
Original line number Diff line number Diff line
@@ -1370,7 +1370,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param,new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param,new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    info->s->state.dellink= HA_OFFSET_ERROR;
@@ -2072,7 +2073,8 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param, new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param, new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    if (param->testflag & T_UNPACK)
@@ -2440,7 +2442,8 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, 
			   param->temp_filename);

      goto err;

    }

    if (filecopy(param, new_file,info->dfile,0L,new_header_length,

    if (new_header_length &&

        filecopy(param, new_file,info->dfile,0L,new_header_length,

		 "datafile-header"))

      goto err;

    if (param->testflag & T_UNPACK)

mysys/my_chsize.c

+3 −1
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ int my_chsize(File fd, my_off_t newlength, int filler, myf MyFlags) 
  DBUG_PRINT("my",("fd: %d  length: %lu  MyFlags: %d",fd,(ulong) newlength,

		   MyFlags));



  oldsize = my_seek(fd, 0L, MY_SEEK_END, MYF(MY_WME+MY_FAE));

  if ((oldsize = my_seek(fd, 0L, MY_SEEK_END, MYF(MY_WME+MY_FAE))) == newlength)

    DBUG_RETURN(0);



  DBUG_PRINT("info",("old_size: %ld", (ulong) oldsize));



  if (oldsize > newlength)