summaryrefslogtreecommitdiff
path: root/mysys/my_write.c
diff options
context:
space:
mode:
authorunknown <kaa@polly.(none)>2007-10-24 21:39:00 +0400
committerunknown <kaa@polly.(none)>2007-10-24 21:39:00 +0400
commitc8282d7b6b9524604c00cd09b27db5b621232fd3 (patch)
tree2b77d176292fcbb7078135c6552f5abef52fd3fe /mysys/my_write.c
parent17e9db8cdbb787b9a1798e05e9ec520067491d90 (diff)
parentc58cebf683d05aac4f4f8d7087c8fa780ecf0c79 (diff)
downloadmariadb-git-c8282d7b6b9524604c00cd09b27db5b621232fd3.tar.gz
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint mysql-test/suite/binlog/t/binlog_killed.test: Auto merged mysys/my_write.c: Auto merged
Diffstat (limited to 'mysys/my_write.c')
-rw-r--r--mysys/my_write.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysys/my_write.c b/mysys/my_write.c
index 056a84f1794..1dd4ff5e405 100644
--- a/mysys/my_write.c
+++ b/mysys/my_write.c
@@ -29,6 +29,10 @@ size_t my_write(int Filedes, const uchar *Buffer, size_t Count, myf MyFlags)
Filedes, (long) Buffer, (ulong) Count, MyFlags));
errors=0; written=0;
+ /* The behavior of write(fd, buf, 0) is not portable */
+ if (unlikely(!Count))
+ return 0;
+
for (;;)
{
if ((writenbytes= write(Filedes, Buffer, Count)) == Count)