diff options
| author | bar@gw.udmsearch.izhnet.ru <> | 2002-04-25 13:36:55 +0500 |
|---|---|---|
| committer | bar@gw.udmsearch.izhnet.ru <> | 2002-04-25 13:36:55 +0500 |
| commit | eab2893dac4f2447baf6b1b2b4f70869e974bf44 (patch) | |
| tree | 5b8a058772659a40e41e2025e66f79531e604613 /isam | |
| parent | c917658988937899e0c21defd4951b51b6d9ff92 (diff) | |
| download | mariadb-git-eab2893dac4f2447baf6b1b2b4f70869e974bf44.tar.gz | |
RB-Tree indexes support in HEAP tables
Renamed _hp_func -> hp_func
mi_key_cmp moved to /mysys/my_handler.c
New tests for HEAP tables
Diffstat (limited to 'isam')
| -rw-r--r-- | isam/isamlog.c | 6 | ||||
| -rw-r--r-- | isam/pack_isam.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/isam/isamlog.c b/isam/isamlog.c index 6d2bde42bf7..3c38caaf141 100644 --- a/isam/isamlog.c +++ b/isam/isamlog.c @@ -342,7 +342,7 @@ static int examine_log(my_string file_name, char **table_names) file_info.process=0; result=uint2korr(head+7); if ((curr_file_info=(struct isamlog_file_info*) - tree_search(&tree,&file_info))) + tree_search(&tree, &file_info, tree.custom_arg))) { curr_file_info->accessed=access_time; if (update && curr_file_info->used && curr_file_info->closed) @@ -444,7 +444,7 @@ static int examine_log(my_string file_name, char **table_names) files_open++; file_info.closed=0; } - VOID(tree_insert(&tree,(gptr) &file_info,0)); + VOID(tree_insert(&tree, (gptr) &file_info, 0, tree.custom_arg)); if (file_info.used) { if (verbose && !record_pos_file) @@ -463,7 +463,7 @@ static int examine_log(my_string file_name, char **table_names) { if (!curr_file_info->closed) files_open--; - VOID(tree_delete(&tree,(gptr) curr_file_info)); + VOID(tree_delete(&tree, (gptr) curr_file_info, tree.custom_arg)); } break; case LOG_EXTRA: diff --git a/isam/pack_isam.c b/isam/pack_isam.c index 4a3a787ff5c..6122a4e6024 100644 --- a/isam/pack_isam.c +++ b/isam/pack_isam.c @@ -762,7 +762,8 @@ static int get_statistic(MRG_INFO *mrg,HUFF_COUNTS *huff_counts) if (count->tree_buff) { global_count=count; - if (!(element=tree_insert(&count->int_tree,pos,0)) || + if (!(element=tree_insert(&count->int_tree, pos, 0, + count->int_tree.custom_arg)) || ((element->count == 1 && count->tree_buff + tree_buff_length < count->tree_pos + count->field_length) || @@ -1733,7 +1734,8 @@ static int compress_isam_file(MRG_INFO *mrg, HUFF_COUNTS *huff_counts) break; case FIELD_INTERVALL: global_count=count; - pos=(byte*) tree_search(&count->int_tree,start_pos); + pos=(byte*) tree_search(&count->int_tree, start_pos, + count->int_tree.custom_arg); intervall=(uint) (pos - count->tree_buff)/field_length; write_bits(tree->code[intervall],(uint) tree->code_len[intervall]); start_pos=end_pos; |