Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my50-bug04053
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
This commit is contained in:
commit
1bbbc65cb5
@ -51,8 +51,11 @@ uint my_read(File Filedes, byte *Buffer, uint Count, myf MyFlags)
|
|||||||
DBUG_PRINT("warning",("Read only %ld bytes off %ld from %d, errno: %d",
|
DBUG_PRINT("warning",("Read only %ld bytes off %ld from %d, errno: %d",
|
||||||
readbytes, Count, Filedes, my_errno));
|
readbytes, Count, Filedes, my_errno));
|
||||||
#ifdef THREAD
|
#ifdef THREAD
|
||||||
if (readbytes == 0 && errno == EINTR)
|
if ((int) readbytes <= 0 && errno == EINTR)
|
||||||
|
{
|
||||||
|
DBUG_PRINT("debug", ("my_read() was interrupted and returned %d", (int) readbytes));
|
||||||
continue; /* Interrupted */
|
continue; /* Interrupted */
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
|
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user