diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-29 16:24:21 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-29 16:24:21 -0400 |
| commit | c681d06f9b1b7a826008303b74ef48fe118fe0e4 (patch) | |
| tree | 8a4347a8719a65a224b41a0ad3bdb5931f264204 /mysys | |
| parent | 90a29133a51d1eb7c4f142c68c68df61a0baf163 (diff) | |
| parent | 04bf9cc7c6f17d9c6ab14a7521c1ab1708f50993 (diff) | |
| download | mariadb-git-c681d06f9b1b7a826008303b74ef48fe118fe0e4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_chsize.c | 4 |
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) |