diff options
author | unknown <svoj@mysql.com/april.(none)> | 2006-10-02 14:52:09 +0500 |
---|---|---|
committer | unknown <svoj@mysql.com/april.(none)> | 2006-10-02 14:52:09 +0500 |
commit | ef5fe1f2b77be77b9e869922e026cd4f24d72ab7 (patch) | |
tree | fc0a5e0080e0fb1ed6b5863ef65c61cf7dbe0098 /mysys | |
parent | dc9669ca04cd7598918a68f96efe69acefdf4dcf (diff) | |
parent | 04bf9cc7c6f17d9c6ab14a7521c1ab1708f50993 (diff) | |
download | mariadb-git-ef5fe1f2b77be77b9e869922e026cd4f24d72ab7.tar.gz |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/table.cc:
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) |