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

Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23

Browse Source
This commit is contained in:
monty@mashka.mysql.fi 2002-11-18 16:21:53 +02:00
commit ace63a30f7
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysys/mf_keycache.c
View File

@ -548,13 +548,14 @@ int flush_key_blocks(File file, enum flush_type type)
count++; count++;
} }
/* Only allocate a new buffer if its bigger than the one we have */ /* Only allocate a new buffer if its bigger than the one we have */
if (count <= FLUSH_CACHE || if (count > FLUSH_CACHE)
!(cache=(SEC_LINK**) my_malloc(sizeof(SEC_LINK*)*count,MYF(0))))
{ {
cache=cache_buff; /* Fall back to safe buffer */ if (!(cache=(SEC_LINK**) my_malloc(sizeof(SEC_LINK*)*count,MYF(0))))
count=FLUSH_CACHE; {
cache=cache_buff; /* Fall back to safe buffer */
count=FLUSH_CACHE;
}
} }
end=cache+count;
} }
/* Go through the keys and write them to buffer to be flushed */ /* Go through the keys and write them to buffer to be flushed */