summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorholyfoot/hf@mysql.com/deer.(none) <>2006-09-25 16:44:53 +0500
committerholyfoot/hf@mysql.com/deer.(none) <>2006-09-25 16:44:53 +0500
commitf8eeebbc4ce95fa8f7dd0a182f556435e4b75a0d (patch)
tree768b7191e2bd33c795921a2f7d677a880bfe11b0 /mysys
parent2e2c5a20c0329ddf432435db25255a8fc047dbd2 (diff)
parent14b16d89d99daad1e601af0cdd5b66200e108b5e (diff)
downloadmariadb-git-f8eeebbc4ce95fa8f7dd0a182f556435e4b75a0d.tar.gz
Merge mysql.com:/home/hf/work/mysql-4.1.15428
into mysql.com:/home/hf/work/mysql-5.0-mrg
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_chsize.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mysys/my_chsize.c b/mysys/my_chsize.c
index 9760de29a08..fe0d0ffa607 100644
--- a/mysys/my_chsize.c
+++ b/mysys/my_chsize.c
@@ -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)