summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authortsmith/tim@siva.hindu.god <>2006-09-29 18:04:34 -0600
committertsmith/tim@siva.hindu.god <>2006-09-29 18:04:34 -0600
commit44f0e55ca417dbb2d0ee6c5f092f70ee1797f579 (patch)
tree51da686809f688c3bde26481f04a66a5e8c4d7b9 /mysys
parentca1f99bdb89b8de5b0cf98f873fc801823700a66 (diff)
parent5275e2437a17b21579c68266145f480b1ad36fcf (diff)
downloadmariadb-git-44f0e55ca417dbb2d0ee6c5f092f70ee1797f579.tar.gz
Merge siva.hindu.god:/usr/home/tim/m/bk/50
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
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)