mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Post-merge fix. Observe C declaration placement rules.

Browse source
This commit is contained in:
Davi Arnaut 2009-09-02 09:02:22 -03:00
parent ff50b26457
commit e512d69434
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mysys/mf_iocache.c
View file

@ -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)