diff options
| author | unknown <monty@nosik.monty.fi> | 2008-01-31 03:11:10 +0200 |
|---|---|---|
| committer | unknown <monty@nosik.monty.fi> | 2008-01-31 03:11:10 +0200 |
| commit | 19b70b6439ed3c7f8650093080ac09f60da02aa2 (patch) | |
| tree | 8d8c68727c21b96332949081b7da5f02bc1bceab /mysys/my_read.c | |
| parent | 5550b4652f8f83d8908e9472b4b2da9b51c84c96 (diff) | |
| parent | c83dee07ba0acc225d8202382b065f1e551a330d (diff) | |
| download | mariadb-git-19b70b6439ed3c7f8650093080ac09f60da02aa2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
mysys/my_pread.c:
Auto merged
mysys/my_read.c:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_page.c:
Auto merged
storage/maria/ma_write.c:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_def.h:
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, |