VladPolskiy/MariaDB
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-16 18:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/41

Browse Source 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/50


mysys/charset.c:
  Auto merged
mysys/my_read.c:
  Manual merge
This commit is contained in:
unknown
2006-09-14 23:22:25 -06:00
parent 2214e282a3 ac1a030e34
commit 06ef603c09
7 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysys/my_read.c
View File

@ -51,10 +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",
readbytes, Count, Filedes, my_errno));
#ifdef THREAD
if ((int) readbytes <= 0 && errno == EINTR)
{
DBUG_PRINT("debug", ("my_read() was interrupted and returned %d", (int) readbytes));
continue; /* Interrupted */
if ((readbytes == 0 || (int) readbytes == -1) && errno == EINTR)
{
DBUG_PRINT("debug", ("my_read() was interrupted and returned %d",
(int) readbytes));
continue; /* Interrupted */
}
#endif
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))