diff options
Diffstat (limited to 'include/keycache.h')
| -rw-r--r-- | include/keycache.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/include/keycache.h b/include/keycache.h index c19fa5988f8..8fa9bf1cd18 100644 --- a/include/keycache.h +++ b/include/keycache.h @@ -1,6 +1,4 @@ -/* - Copyright (c) 2003-2007 MySQL AB, 2009 Sun Microsystems, Inc. - Use is subject to license terms. +/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,16 +11,16 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ /* Key cache variable structures */ #ifndef _keycache_h #define _keycache_h -C_MODE_START +#include "my_sys.h" /* flush_type */ +C_MODE_START /* Currently the default key cache is created as non-partitioned at @@ -144,10 +142,10 @@ typedef struct st_key_cache void *keycache_cb; /* control block of the used key cache */ KEY_CACHE_FUNCS *interface_funcs; /* interface functions of the key cache */ ulonglong param_buff_size; /* size the memory allocated for the cache */ - ulong param_block_size; /* size of the blocks in the key cache */ - ulong param_division_limit; /* min. percentage of warm blocks */ - ulong param_age_threshold; /* determines when hot block is downgraded */ - ulong param_partitions; /* number of the key cache partitions */ + ulonglong param_block_size; /* size of the blocks in the key cache */ + ulonglong param_division_limit;/* min. percentage of warm blocks */ + ulonglong param_age_threshold; /* determines when hot block is downgraded */ + ulonglong param_partitions; /* number of the key cache partitions */ my_bool key_cache_inited; /* <=> key cache has been created */ my_bool can_be_used; /* usage of cache for read/write is allowed */ my_bool in_init; /* set to 1 in MySQL during init/resize */ @@ -198,7 +196,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, |