diff options
| author | unknown <monty@work.mysql.com> | 2001-06-12 14:12:35 +0200 |
|---|---|---|
| committer | unknown <monty@work.mysql.com> | 2001-06-12 14:12:35 +0200 |
| commit | a9e6b975fcf37c491870b3bf18493d0351ffc34f (patch) | |
| tree | a5f1c279fea2101ed23cc2fffa79f3517349aff2 /mysys | |
| parent | 64dc74a13d17b863f0ed69b4f7d621b1b5da48ce (diff) | |
| parent | cdcc56705c89909a4077008640aebc894504e99d (diff) | |
| download | mariadb-git-a9e6b975fcf37c491870b3bf18493d0351ffc34f.tar.gz | |
merge
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
sql-bench/server-cfg.sh:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_pread.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/my_pread.c b/mysys/my_pread.c index 4e0de71bcf5..5c7d0be5854 100644 --- a/mysys/my_pread.c +++ b/mysys/my_pread.c @@ -66,11 +66,11 @@ uint my_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset, my_filename(Filedes),my_errno); } if ((int) readbytes == -1 || (MyFlags & (MY_FNABP | MY_NABP))) - DBUG_RETURN(MY_FILE_ERROR); /* Return with error */ + DBUG_RETURN(MY_FILE_ERROR); /* Return with error */ } if (MyFlags & (MY_NABP | MY_FNABP)) - DBUG_RETURN(0); /* Ok vid l{sning */ - DBUG_RETURN(readbytes); /* purecov: inspected */ + DBUG_RETURN(0); /* Read went ok; Return 0 */ + DBUG_RETURN(readbytes); /* purecov: inspected */ } } /* my_pread */ |