diff options
| author | serg@serg.mysql.com <> | 2001-07-02 21:18:57 +0200 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2001-07-02 21:18:57 +0200 |
| commit | 15b6738474fd9df56c4aff8f984278cd374bd3f3 (patch) | |
| tree | c2f7be1c19137e631cb5b7d9a3163a215a3d14e6 /isam | |
| parent | 3c7cc2285c6a80cd998faa5d669d7d9d0d20b632 (diff) | |
| download | mariadb-git-15b6738474fd9df56c4aff8f984278cd374bd3f3.tar.gz | |
memory-limited tree
bulk inserts optimization: caching keys in binary tree
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/isamlog.c | 4 | ||||
| -rw-r--r-- | isam/pack_isam.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/isam/isamlog.c b/isam/isamlog.c index d1347d46c2e..675a56e8fd9 100644 --- a/isam/isamlog.c +++ b/isam/isamlog.c @@ -325,8 +325,8 @@ static int examine_log(my_string file_name, char **table_names) init_io_cache(&cache,file,0,READ_CACHE,start_offset,0,MYF(0)); bzero((gptr) com_count,sizeof(com_count)); - init_tree(&tree,0,sizeof(file_info),(qsort_cmp) file_info_compare,1, - (void(*)(void*)) file_info_free); + init_tree(&tree,0,0,sizeof(file_info),(qsort_cmp2) file_info_compare,1, + (tree_element_free) file_info_free, NULL); VOID(init_key_cache(KEY_CACHE_SIZE,(uint) (10*4*(IO_SIZE+MALLOC_OVERHEAD)))); files_open=0; access_time=0; diff --git a/isam/pack_isam.c b/isam/pack_isam.c index c2cbb72cf74..b8814527af2 100644 --- a/isam/pack_isam.c +++ b/isam/pack_isam.c @@ -684,7 +684,7 @@ static HUFF_COUNTS *init_huff_count(N_INFO *info,my_off_t records) (type == FIELD_NORMAL || type == FIELD_SKIPP_ZERO)) count[i].max_zero_fill= count[i].field_length; - init_tree(&count[i].int_tree,0,-1,(qsort_cmp) compare_tree,0,NULL); + init_tree(&count[i].int_tree,0,0,-1,(qsort_cmp2) compare_tree,0,NULL,NULL); if (records) count[i].tree_pos=count[i].tree_buff = my_malloc(count[i].field_length > 1 ? tree_buff_length : 2, |