diff options
| author | unknown <igor@rurik.mysql.com> | 2003-06-30 09:53:04 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2003-06-30 09:53:04 -0700 |
| commit | dabe472203efe96b8688998ff1685492ed57261b (patch) | |
| tree | bc0fbb84e9c732cd6a72e75870455d59f00c5850 /include | |
| parent | 0a1d7d64c85894fda6ff1f6342b167d22110dbf7 (diff) | |
| parent | 42817571dcb59e16f27cdf28843f26e45da893ee (diff) | |
| download | mariadb-git-dabe472203efe96b8688998ff1685492ed57261b.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
myisam/mi_preload.c:
Auto merged
myisam/myisamchk.c:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 48ebdc22f37..7f4d0e0e62f 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -248,6 +248,8 @@ extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io, extern char wild_many,wild_one,wild_prefix; extern const char *charsets_dir; extern char *defaults_extra_file; +extern void *dflt_keycache; +#define dflt_key_block_size DEFAULT_KEYCACHE_BLOCK_SIZE typedef struct wild_file_pack /* Struct to hold info when selecting files */ { @@ -639,16 +641,21 @@ extern int flush_write_cache(RECORD_CACHE *info); extern long my_clock(void); extern sig_handler sigtstp_handler(int signal_number); extern void handle_recived_signals(void); -extern int init_key_cache(ulong use_mem); -extern int resize_key_cache(ulong use_mem); -extern byte *key_cache_read(File file,my_off_t filepos,byte* buff,uint length, +extern int init_key_cache(void **pkeycache,uint key_cache_block_size, + ulong use_mem); +extern int resize_key_cache(void **pkeycache,ulong use_mem); +extern byte *key_cache_read(void *pkeycache, + File file,my_off_t filepos,byte* buff,uint length, uint block_length,int return_buffer); -extern int key_cache_insert(File file, my_off_t filepos, +extern int key_cache_insert(void *pkeycache, + File file, my_off_t filepos, byte *buff, uint length); -extern int key_cache_write(File file,my_off_t filepos,byte* buff,uint length, +extern int key_cache_write(void *pkeycache, + File file,my_off_t filepos,byte* buff,uint length, uint block_length,int force_write); -extern int flush_key_blocks(int file, enum flush_type type); -extern void end_key_cache(void); +extern int flush_key_blocks(void *pkeycache, + int file, enum flush_type type); +extern void end_key_cache(void **pkeycache,my_bool cleanup); extern sig_handler my_set_alarm_variable(int signo); extern void my_string_ptr_sort(void *base,uint items,size_s size); extern void radixsort_for_str_ptr(uchar* base[], uint number_of_elements, |