Commit 63ca7570 authored by kaa@polly.(none)'s avatar kaa@polly.(none)

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
parents d3293988 2c9720c2
...@@ -242,7 +242,7 @@ drop function bug27563; ...@@ -242,7 +242,7 @@ drop function bug27563;
drop function bug27565; 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; drop table t1,t2,t3;
...@@ -29,6 +29,10 @@ size_t my_write(int Filedes, const uchar *Buffer, size_t Count, myf MyFlags) ...@@ -29,6 +29,10 @@ size_t my_write(int Filedes, const uchar *Buffer, size_t Count, myf MyFlags)
Filedes, (long) Buffer, (ulong) Count, MyFlags)); Filedes, (long) Buffer, (ulong) Count, MyFlags));
errors=0; written=0; errors=0; written=0;
/* The behavior of write(fd, buf, 0) is not portable */
if (unlikely(!Count))
return 0;
for (;;) for (;;)
{ {
if ((writenbytes= write(Filedes, Buffer, Count)) == Count) if ((writenbytes= write(Filedes, Buffer, Count)) == Count)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment