summaryrefslogtreecommitdiff
path: root/isam
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-07-02 21:18:57 +0200
committerunknown <serg@serg.mysql.com>2001-07-02 21:18:57 +0200
commit2d28c646cbd53c1fcdf800dc408580aa5377f3b9 (patch)
treec2f7be1c19137e631cb5b7d9a3163a215a3d14e6 /isam
parenta1bb645cb28e3e9037e62934ac370b935bd8acc1 (diff)
downloadmariadb-git-2d28c646cbd53c1fcdf800dc408580aa5377f3b9.tar.gz
memory-limited tree
bulk inserts optimization: caching keys in binary tree include/my_base.h: bulk inserts optimization: caching keys in binary tree include/my_tree.h: memory-limited tree include/myisam.h: bulk inserts optimization: caching keys in binary tree isam/isamlog.c: memory-limited tree isam/pack_isam.c: memory-limited tree myisam/ft_boolean_search.c: memory-limited tree myisam/ft_nlq_search.c: memory-limited tree myisam/ft_parser.c: memory-limited tree myisam/ft_stopwords.c: memory-limited tree myisam/mi_extra.c: bulk inserts optimization: caching keys in binary tree myisam/mi_open.c: bulk inserts optimization: caching keys in binary tree myisam/mi_static.c: bulk inserts optimization: caching keys in binary tree myisam/mi_write.c: bulk inserts optimization: caching keys in binary tree myisam/myisamdef.h: bulk inserts optimization: caching keys in binary tree myisam/myisamlog.c: memory-limited tree myisam/myisampack.c: memory-limited tree mysql-test/mysql-test-run.sh: memory-limited tree mysql-test/t/alter_table.test: make it faster mysys/tree.c: memory-limited tree sql/ha_myisam.cc: bulk inserts optimization: caching keys in binary tree sql/item_sum.cc: memory-limited tree sql/mysqld.cc: bulk inserts optimization: caching keys in binary tree sql/sql_analyse.h: memory-limited tree sql/uniques.cc: memory-limited tree
Diffstat (limited to 'isam')
-rw-r--r--isam/isamlog.c4
-rw-r--r--isam/pack_isam.c2
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,