diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-09-02 09:12:18 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-09-02 09:12:18 -0300 |
| commit | f076ba2803f8665480e4134d8fd3e34fd157e0f8 (patch) | |
| tree | 9a0ed0877c40e5d2fc5bab5ce6e1b7ec2edaa1a1 /mysys | |
| parent | 5109313e664edb0e99fcf2d7afcba5cfc00f6b66 (diff) | |
| parent | ca96ac53518f97655e34b590463887a3e166a266 (diff) | |
| download | mariadb-git-f076ba2803f8665480e4134d8fd3e34fd157e0f8.tar.gz | |
Manual merge.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_iocache.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 41f7b1cae7d..1a47982b221 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -227,18 +227,21 @@ int init_io_cache(IO_CACHE *info, File file, size_t cachesize, for (;;) { size_t buffer_block; + /* + Unset MY_WAIT_IF_FULL bit if it is set, to prevent conflict with + MY_ZEROFILL. + */ + myf flags= (myf) (cache_myflags & ~(MY_WME | MY_WAIT_IF_FULL)); + if (cachesize < min_cache) cachesize = min_cache; buffer_block= cachesize; if (type == SEQ_READ_APPEND) buffer_block *= 2; - /* - Unset MY_WAIT_IF_FULL bit if it is set, to prevent conflict with - MY_ZEROFILL. - */ - myf flag = MYF((cache_myflags & ~ (MY_WME | MY_WAIT_IF_FULL)) | - (cachesize == min_cache ? MY_WME : 0)); - if ((info->buffer= (uchar*) my_malloc(buffer_block, flag)) != 0) + if (cachesize == min_cache) + flags|= (myf) MY_WME; + + if ((info->buffer= (uchar*) my_malloc(buffer_block, flags)) != 0) { info->write_buffer=info->buffer; if (type == SEQ_READ_APPEND) |