Commit e16e4a7c authored by rburnett@production.mysql.com's avatar rburnett@production.mysql.com

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

into  production.mysql.com:/usersnfs/rburnett/mysql-5.1
parents 50efe4ed c31c2eba
...@@ -22,14 +22,15 @@ ...@@ -22,14 +22,15 @@
my_off_t my_seek(File fd, my_off_t pos, int whence, my_off_t my_seek(File fd, my_off_t pos, int whence,
myf MyFlags __attribute__((unused))) myf MyFlags __attribute__((unused)))
{ {
reg1 os_off_t newpos; reg1 os_off_t newpos= -1;
DBUG_ENTER("my_seek"); DBUG_ENTER("my_seek");
DBUG_PRINT("my",("Fd: %d Hpos: %lu Pos: %lu Whence: %d MyFlags: %d", DBUG_PRINT("my",("Fd: %d Hpos: %lu Pos: %lu Whence: %d MyFlags: %d",
fd, (ulong) (((ulonglong) pos) >> 32), (ulong) pos, fd, (ulong) (((ulonglong) pos) >> 32), (ulong) pos,
whence, MyFlags)); whence, MyFlags));
DBUG_ASSERT(pos != MY_FILEPOS_ERROR); /* safety check */ DBUG_ASSERT(pos != MY_FILEPOS_ERROR); /* safety check */
newpos=lseek(fd, pos, whence); if (-1 != fd)
newpos=lseek(fd, pos, whence);
if (newpos == (os_off_t) -1) if (newpos == (os_off_t) -1)
{ {
my_errno=errno; my_errno=errno;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment