mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
This commit is contained in:
kaa@polly.(none) 2007-10-24 23:07:10 +04:00
commit 7fab2f1414
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/binlog/t/binlog_killed.test
View file

@ -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;

4
mysys/my_write.c
View file

@ -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)