diff options
author | kaa@polly.(none) <> | 2007-10-24 21:30:38 +0400 |
---|---|---|
committer | kaa@polly.(none) <> | 2007-10-24 21:30:38 +0400 |
commit | 2c9720c20ec8d0fa341080bdc82ab00063dd4156 (patch) | |
tree | 48f53bfee73eb453183a38e86310e7617fec974b /mysys | |
parent | d3527572d5c08c2cf49d16f36cbd0b5edc5ace91 (diff) | |
parent | 78aa659979b02afeb26ec51742559e516a2ba41e (diff) | |
download | mariadb-git-2c9720c20ec8d0fa341080bdc82ab00063dd4156.tar.gz |
Merge polly.(none):/home/kaa/src/maint/bug31566/my50-bug31566
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/my_write.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/my_write.c b/mysys/my_write.c index 4c3d187e4e8..08d70accd57 100644 --- a/mysys/my_write.c +++ b/mysys/my_write.c @@ -29,6 +29,10 @@ uint my_write(int Filedes, const byte *Buffer, uint Count, myf MyFlags) Filedes, (long) Buffer, Count, MyFlags)); errors=0; written=0L; + /* The behavior of write(fd, buf, 0) is not portable */ + if (unlikely(!Count)) + return 0; + for (;;) { if ((writenbytes = (uint) write(Filedes, Buffer, Count)) == Count) |