Commit bf3501a5 authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  production.mysql.com:/usersnfs/rburnett/mysql-5.1
parents 647eefca 5cb93cc3

mysys/my_seek.c

+3 −2
Original line number Diff line number Diff line
@@ -22,13 +22,14 @@ 
my_off_t my_seek(File fd, my_off_t pos, int whence,

		 myf MyFlags __attribute__((unused)))

{

  reg1 os_off_t newpos;

  reg1 os_off_t newpos= -1;

  DBUG_ENTER("my_seek");

  DBUG_PRINT("my",("Fd: %d  Hpos: %lu  Pos: %lu  Whence: %d  MyFlags: %d",

		   fd, (ulong) (((ulonglong) pos) >> 32), (ulong) pos, 

		   whence, MyFlags));

  DBUG_ASSERT(pos != MY_FILEPOS_ERROR);		/* safety check */



  if (-1 != fd)

    newpos=lseek(fd, pos, whence);

  if (newpos == (os_off_t) -1)

  {