Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint

mysql-test/suite/binlog/t/binlog_killed.test

@@ -242,7 +242,7 @@ drop function bug27563;
 drop function bug27565;
 }
 
-system rm $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog ;
+remove_file $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog ;
 
 drop table t1,t2,t3;
 

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)