diff options
| author | monty@mashka.mysql.fi <> | 2002-11-18 16:21:53 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2002-11-18 16:21:53 +0200 |
| commit | ace63a30f7789d9e89216e165516dcad7f192cef (patch) | |
| tree | 99419c96d1c2e6eda2f6a0c28e3ebfbe04e89081 /mysys | |
| parent | 996255648b392ea5cb59d086e7ef49499f58df78 (diff) | |
| parent | 0d0bf207c4b7e987ac4daf6ea0d44434ee4e30ce (diff) | |
| download | mariadb-git-ace63a30f7789d9e89216e165516dcad7f192cef.tar.gz | |
Merge work:/home/bk/mysql into mashka.mysql.fi:/home/my/mysql-3.23
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_keycache.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 5b8ec96b4d1..d5b0a0a056a 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -548,13 +548,14 @@ int flush_key_blocks(File file, enum flush_type type) count++; } /* Only allocate a new buffer if its bigger than the one we have */ - if (count <= FLUSH_CACHE || - !(cache=(SEC_LINK**) my_malloc(sizeof(SEC_LINK*)*count,MYF(0)))) + if (count > FLUSH_CACHE) { - cache=cache_buff; /* Fall back to safe buffer */ - count=FLUSH_CACHE; + if (!(cache=(SEC_LINK**) my_malloc(sizeof(SEC_LINK*)*count,MYF(0)))) + { + 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 */ |