summaryrefslogtreecommitdiff
path: root/include/keycache.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-04-25 17:22:25 +0200
committerSergei Golubchik <sergii@pisem.net>2011-04-25 17:22:25 +0200
commit0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch)
treebdf0738c29dc1f57fbfba3a1754524e238f15b52 /include/keycache.h
parent37f87d73ae8dc6c30594867b40a5d70159acf63c (diff)
downloadmariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz
lots of post-merge changes
Diffstat (limited to 'include/keycache.h')
-rw-r--r--include/keycache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/keycache.h b/include/keycache.h
index 6220f6266fa..bc14bdef0bf 100644
--- a/include/keycache.h
+++ b/include/keycache.h
@@ -195,7 +195,7 @@ extern my_bool multi_key_cache_set(const uchar *key, uint length,
extern void multi_key_cache_change(KEY_CACHE *old_data,
KEY_CACHE *new_data);
extern int reset_key_cache_counters(const char *name,
- KEY_CACHE *key_cache);
+ KEY_CACHE *key_cache, void *);
extern int repartition_key_cache(KEY_CACHE *keycache,
uint key_cache_block_size,
size_t use_mem,