diff options
author | unknown <monty@bitch.mysql.fi> | 2001-11-28 02:55:52 +0200 |
---|---|---|
committer | unknown <monty@bitch.mysql.fi> | 2001-11-28 02:55:52 +0200 |
commit | 06e1e27557cc6788fafd423eea6ca5073dce892a (patch) | |
tree | 40e5d73c964ca6aeb5e0e7d4294e70216edaa397 /mysys/my_seek.c | |
parent | f33fb18677d673f1bcb2d617355ea3e2dbb04f48 (diff) | |
download | mariadb-git-06e1e27557cc6788fafd423eea6ca5073dce892a.tar.gz |
New improved IO_CACHE
include/my_global.h:
Remove dbug_assert() (One should use DBUG_ASSERT() instead)
mysql-test/mysql-test-run.sh:
Fixed that xterm works on Solaris 2.8.
Fixed printing of errors
mysql-test/r/isam.result:
Removed MyISAM test from ISAM test
mysql-test/t/isam.test:
Removed MyISAM test from ISAM test
mysys/my_alloc.c:
Removed warnings
mysys/my_bitmap.c:
Use DBUG_ASSERT
mysys/my_pthread.c:
Use DBUG_ASSERT
mysys/my_seek.c:
More DBUG
sql/ha_berkeley.cc:
Use DBUG_ASSERT
sql/ha_innobase.cc:
Use DBUG_ASSERT
sql/log.cc:
Use DBUG_ASSERT
sql/opt_range.cc:
Use DBUG_ASSERT
sql/sql_base.cc:
Use DBUG_ASSERT
sql/sql_handler.cc:
Use DBUG_ASSERT
sql/sql_load.cc:
Cleanup
sql/sql_parse.cc:
Use DBUG_ASSERT
sql/sql_repl.cc:
Cleanup
sql/sql_select.cc:
Use DBUG_ASSERT
tools/mysqlmanager.c:
Cleanup
Diffstat (limited to 'mysys/my_seek.c')
-rw-r--r-- | mysys/my_seek.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mysys/my_seek.c b/mysys/my_seek.c index 7c4da4f6010..87da4d93cb7 100644 --- a/mysys/my_seek.c +++ b/mysys/my_seek.c @@ -26,7 +26,8 @@ my_off_t my_seek(File fd, my_off_t pos, int whence, reg1 os_off_t newpos; DBUG_ENTER("my_seek"); DBUG_PRINT("my",("Fd: %d Hpos: %lu Pos: %lu Whence: %d MyFlags: %d", - fd, ((ulonglong) pos) >> 32, (ulong) pos, whence, MyFlags)); + fd, (ulong) (((ulonglong) pos) >> 32), (ulong) pos, + whence, MyFlags)); newpos=lseek(fd, pos, whence); if (newpos == (os_off_t) -1) { @@ -34,6 +35,10 @@ my_off_t my_seek(File fd, my_off_t pos, int whence, DBUG_PRINT("error",("lseek: %lu, errno: %d",newpos,errno)); DBUG_RETURN(MY_FILEPOS_ERROR); } + if (newpos != pos) + { + DBUG_PRINT("exit",("pos: %lu", (ulong) newpos)); + } DBUG_RETURN((my_off_t) newpos); } /* my_seek */ @@ -53,6 +58,6 @@ my_off_t my_tell(File fd, myf MyFlags __attribute__((unused))) #endif if (pos == (os_off_t) -1) my_errno=errno; - DBUG_PRINT("exit",("pos: %lu",pos)); + DBUG_PRINT("exit",("pos: %lu", (ulong) pos)); DBUG_RETURN((my_off_t) pos); } /* my_tell */ |