diff options
| author | unknown <thek@kpdesk.mysql.com> | 2006-11-01 17:01:51 +0100 |
|---|---|---|
| committer | unknown <thek@kpdesk.mysql.com> | 2006-11-01 17:01:51 +0100 |
| commit | 35f18203585d569a6df941536159b0806a19f8ff (patch) | |
| tree | 36dd8def41b63e03f75b1fb10d60480b38fd981e /mysys/my_chsize.c | |
| parent | 73a7995b029ba5bd2ad9d9b32ee89fb383a68a10 (diff) | |
| parent | 2d1215f4c6d1ddb4dc7da21a9af0a8e1af6fbfca (diff) | |
| download | mariadb-git-35f18203585d569a6df941536159b0806a19f8ff.tar.gz | |
Merge kpdesk.mysql.com:/home/thek/dev/mysql-4.1-maint
into kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint
mysys/my_chsize.c:
Auto merged
mysys/my_seek.c:
Auto merged
mysys/mf_iocache.c:
Merged patch:
- Moved comments
- Moved check on return value of my_seek.
Diffstat (limited to 'mysys/my_chsize.c')
| -rw-r--r-- | mysys/my_chsize.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mysys/my_chsize.c b/mysys/my_chsize.c index fe0d0ffa607..4b26085c870 100644 --- a/mysys/my_chsize.c +++ b/mysys/my_chsize.c @@ -86,7 +86,11 @@ int my_chsize(File fd, my_off_t newlength, int filler, myf MyFlags) Fill space between requested length and true length with 'filler' We should never come here on any modern machine */ - VOID(my_seek(fd, newlength, MY_SEEK_SET, MYF(MY_WME+MY_FAE))); + if (my_seek(fd, newlength, MY_SEEK_SET, MYF(MY_WME+MY_FAE)) + == MY_FILEPOS_ERROR) + { + goto err; + } swap_variables(my_off_t, newlength, oldsize); #endif } |