diff options
| author | unknown <sanja@askmonty.org> | 2011-09-02 15:10:10 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2011-09-02 15:10:10 +0300 |
| commit | b152c4c71dff8b2142e220850d9329fe63f4cfbd (patch) | |
| tree | 585b0d57da5c535a64dc5393a268e2d4c81c2066 /mysys/my_read.c | |
| parent | ea8aa329099ee28ec6f1266d8d01a6fc664259cf (diff) | |
| parent | 37a8497d494ea256ff4b13a89e62150e06a17dae (diff) | |
| download | mariadb-git-b152c4c71dff8b2142e220850d9329fe63f4cfbd.tar.gz | |
Merge 5.2->5.3
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 5fef4455f62..8ababb31324 100644 --- a/mysys/my_read.c +++ b/mysys/my_read.c @@ -40,6 +40,8 @@ size_t my_read(File Filedes, uchar *Buffer, size_t Count, myf MyFlags) DBUG_PRINT("my",("fd: %d Buffer: 0x%lx Count: %lu MyFlags: %d", Filedes, (long) Buffer, (ulong) Count, MyFlags)); save_count= Count; + if (!(MyFlags & (MY_WME | MY_FAE | MY_FNABP))) + MyFlags|= my_global_flags; for (;;) { @@ -69,10 +71,12 @@ size_t my_read(File Filedes, uchar *Buffer, size_t Count, myf MyFlags) if (MyFlags & (MY_WME | MY_FAE | MY_FNABP)) { if (readbytes == (size_t) -1) - my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG), + my_error(EE_READ, + MYF(ME_BELL | ME_WAITTANG | (MyFlags & (ME_JUST_INFO | ME_NOREFRESH))), my_filename(Filedes),my_errno); else if (MyFlags & (MY_NABP | MY_FNABP)) - my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG), + my_error(EE_EOFERR, + MYF(ME_BELL | ME_WAITTANG | (MyFlags & (ME_JUST_INFO | ME_NOREFRESH))), my_filename(Filedes),my_errno); } if (readbytes == (size_t) -1 || |