1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Georgi Kodinov 2009-09-02 15:33:18 +03:00
commit 607c399f8b
2 changed files with 11 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 (;;) for (;;)
{ {
uint buffer_block; 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) if (cachesize < min_cache)
cachesize = min_cache; cachesize = min_cache;
buffer_block = cachesize; buffer_block = cachesize;
if (type == SEQ_READ_APPEND) if (type == SEQ_READ_APPEND)
buffer_block *= 2; buffer_block *= 2;
/* if (cachesize == min_cache)
Unset MY_WAIT_IF_FULL bit if it is set, to prevent conflict with flags|= (myf) MY_WME;
MY_ZEROFILL. if ((info->buffer= (byte*) my_malloc(buffer_block, flags)) != 0)
*/
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)
{ {
info->write_buffer=info->buffer; info->write_buffer=info->buffer;
if (type == SEQ_READ_APPEND) if (type == SEQ_READ_APPEND)

2
mysys/my_redel.c
View File

@ -77,7 +77,9 @@ end:
int my_copystat(const char *from, const char *to, int MyFlags) int my_copystat(const char *from, const char *to, int MyFlags)
{ {
struct stat statbuf; struct stat statbuf;
#if !defined(MSDOS) && !defined(__WIN__) && !defined(__EMX__) && !defined(OS2) && !defined(__NETWARE__)
int res; int res;
#endif /* MSDOS */
if (stat((char*) from, &statbuf)) if (stat((char*) from, &statbuf))
{ {