1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge abarkov@work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
This commit is contained in:
bar@bar.mysql.r18.ru 2002-11-11 13:57:18 +04:00
commit 9f019fea2d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_tree.h
View File

@ -91,7 +91,7 @@ void *tree_search_edge(TREE *tree, TREE_ELEMENT **parents,
TREE_ELEMENT ***last_pos, int child_offs); TREE_ELEMENT ***last_pos, int child_offs);
void *tree_search_next(TREE *tree, TREE_ELEMENT ***last_pos, int l_offs, void *tree_search_next(TREE *tree, TREE_ELEMENT ***last_pos, int l_offs,
int r_offs); int r_offs);
uint tree_record_pos(TREE *tree, const void *key, ha_rows tree_record_pos(TREE *tree, const void *key,
enum ha_rkey_function search_flag, void *custom_arg); enum ha_rkey_function search_flag, void *custom_arg);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
mysys/tree.c
View File

@ -439,14 +439,14 @@ void *tree_search_next(TREE *tree, TREE_ELEMENT ***last_pos, int l_offs,
Expected that tree is fully balanced Expected that tree is fully balanced
(each path from root to leaf has the same length) (each path from root to leaf has the same length)
*/ */
uint tree_record_pos(TREE *tree, const void *key, ha_rows tree_record_pos(TREE *tree, const void *key,
enum ha_rkey_function flag, void *custom_arg) enum ha_rkey_function flag, void *custom_arg)
{ {
int cmp; int cmp;
TREE_ELEMENT *element= tree->root; TREE_ELEMENT *element= tree->root;
double left= 1; double left= 1;
double right= tree->elements_in_tree; double right= tree->elements_in_tree;
uint last_equal_pos= HA_POS_ERROR; ha_rows last_equal_pos= HA_POS_ERROR;
while (element != &tree->null_element) while (element != &tree->null_element)
{ {