summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com/april.(none)>2006-10-02 14:42:12 +0500
committerunknown <svoj@mysql.com/april.(none)>2006-10-02 14:42:12 +0500
commit350ec8b198aef8dd9b747b55dc8cd0af4484919d (patch)
tree4a2560ff2c62ee1499466092f2d6081d2b1c89c0 /mysys
parent41773604c76bb8cec9e37bff347cddfeeaa83d34 (diff)
parentb8fe620615adb5a5ab6804689e5111b4d9952c2e (diff)
downloadmariadb-git-350ec8b198aef8dd9b747b55dc8cd0af4484919d.tar.gz
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines mysql-test/r/myisam.result: Auto merged mysql-test/t/myisam.test: Auto merged sql/table.cc: Auto merged
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 cf26428d65f..efc19927183 100644
--- a/mysys/my_chsize.c
+++ b/mysys/my_chsize.c
@@ -44,7 +44,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)