diff options
| author | tsmith/tim@siva.hindu.god <> | 2006-09-14 23:20:13 -0600 |
|---|---|---|
| committer | tsmith/tim@siva.hindu.god <> | 2006-09-14 23:20:13 -0600 |
| commit | 43e8890abc5d48de0bb626081e685770bbbbe8cf (patch) | |
| tree | 7e5caf8377fbd0f5505ff2bd40395415af23304f /mysys/my_read.c | |
| parent | 5ec2bfe94c28ad73a691d90b784138f38e9134cd (diff) | |
| parent | 7b9f4086fa55b1e3414740d0a6e337134794ab05 (diff) | |
| download | mariadb-git-43e8890abc5d48de0bb626081e685770bbbbe8cf.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/40
into siva.hindu.god:/usr/home/tim/m/bk/tmp/41
Diffstat (limited to 'mysys/my_read.c')
| -rw-r--r-- | mysys/my_read.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mysys/my_read.c b/mysys/my_read.c index 9de070e772d..f137a8b0f0a 100644 --- a/mysys/my_read.c +++ b/mysys/my_read.c @@ -51,8 +51,12 @@ 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 (readbytes == 0 && errno == EINTR) - 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)) { |