diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-09-14 23:22:25 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-09-14 23:22:25 -0600 |
| commit | 06ef603c0974d045fd173380b5e2caae92cd4d38 (patch) | |
| tree | f08ee152e3d58f0e4b866743241b14914db43e6d /mysys/my_read.c | |
| parent | 2214e282a3f37419aeb791350e461b07662845b8 (diff) | |
| parent | ac1a030e34aa4ca29cd93679541e2f9fbeb83382 (diff) | |
| download | mariadb-git-06ef603c0974d045fd173380b5e2caae92cd4d38.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/41
into siva.hindu.god:/usr/home/tim/m/bk/tmp/50
mysys/charset.c:
Auto merged
mysys/my_read.c:
Manual merge
Diffstat (limited to 'mysys/my_read.c')
| -rw-r--r-- | mysys/my_read.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mysys/my_read.c b/mysys/my_read.c index 2e23f2175f8..8b88e483fef 100644 --- a/mysys/my_read.c +++ b/mysys/my_read.c @@ -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)) |