diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-09-02 09:02:22 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-09-02 09:02:22 -0300 |
| commit | ca96ac53518f97655e34b590463887a3e166a266 (patch) | |
| tree | 0a70fde1bf181bb1ee3138aba1b2ec40d6b74ce1 | |
| parent | cdea23eba47bb2b2915fbb995875c430e714eac4 (diff) | |
| download | mariadb-git-ca96ac53518f97655e34b590463887a3e166a266.tar.gz | |
Post-merge fix. Observe C declaration placement rules.
| -rw-r--r-- | mysys/mf_iocache.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index 3aab904a6e0..c4c48f9c121 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -228,18 +228,20 @@ int init_io_cache(IO_CACHE *info, File file, uint cachesize, for (;;) { uint 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= (byte*) my_malloc(buffer_block, flag)) != 0) + if (cachesize == min_cache) + flags|= (myf) MY_WME; + if ((info->buffer= (byte*) my_malloc(buffer_block, flags)) != 0) { info->write_buffer=info->buffer; if (type == SEQ_READ_APPEND) |