diff options
| author | unknown <bell@desktop.sanja.is.com.ua> | 2008-01-31 13:36:58 +0200 |
|---|---|---|
| committer | unknown <bell@desktop.sanja.is.com.ua> | 2008-01-31 13:36:58 +0200 |
| commit | 8c5cd4f89d165665e8b6cebd2161c41d5ce6a77e (patch) | |
| tree | fc48eeea4ff8f1449354356eb8ea641a9811a1a9 /mysys/my_read.c | |
| parent | caa0e9b18121c0e047b3fc7e7f827ebff0af7d4f (diff) | |
| parent | d2f47638d76e272f5c02375a3a77d108c067e825 (diff) | |
| download | mariadb-git-8c5cd4f89d165665e8b6cebd2161c41d5ce6a77e.tar.gz | |
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-maria
into desktop.sanja.is.com.ua:/home/bell/tmp/work-maria-assert
storage/maria/ma_loghandler.c:
Auto merged
Diffstat (limited to 'mysys/my_read.c')
| -rw-r--r-- | mysys/my_read.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_read.c b/mysys/my_read.c index 0d6c8d14416..64f2cf42b4c 100644 --- a/mysys/my_read.c +++ b/mysys/my_read.c @@ -51,7 +51,8 @@ size_t my_read(File Filedes, uchar *Buffer, size_t Count, myf MyFlags) if ((readbytes= read(Filedes, Buffer, Count)) != Count) { my_errno= errno; - if (errno == 0 || (errno == -1 && (MyFlags & (MY_NABP | MY_FNABP)))) + if (errno == 0 || (readbytes == (size_t) -1 && + (MyFlags & (MY_NABP | MY_FNABP)))) my_errno= HA_ERR_FILE_TOO_SHORT; DBUG_PRINT("warning",("Read only %d bytes off %lu from %d, errno: %d", (int) readbytes, (ulong) Count, Filedes, |