diff options
author | unknown <bar@bar.mysql.r18.ru> | 2002-11-11 13:57:18 +0400 |
---|---|---|
committer | unknown <bar@bar.mysql.r18.ru> | 2002-11-11 13:57:18 +0400 |
commit | 4fb279493a56ce129ef0a085798b0bd56ed598a4 (patch) | |
tree | 9a55f1d3526ce9c7f08e513c09a24d957802d278 /mysys | |
parent | ae9b4fe2a72a4a1bf47a79160d186ef92c90425a (diff) | |
parent | 6a9a51d67d30c5408f47b8c961582ea87efce957 (diff) | |
download | mariadb-git-4fb279493a56ce129ef0a085798b0bd56ed598a4.tar.gz |
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/tree.c b/mysys/tree.c index f72a4961312..3e20820ebd9 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -439,14 +439,14 @@ void *tree_search_next(TREE *tree, TREE_ELEMENT ***last_pos, int l_offs, Expected that tree is fully balanced (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) { int cmp; TREE_ELEMENT *element= tree->root; double left= 1; 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) { |