diff options
| author | ram@mysql.r18.ru <> | 2002-11-11 13:35:54 +0400 |
|---|---|---|
| committer | ram@mysql.r18.ru <> | 2002-11-11 13:35:54 +0400 |
| commit | a578ef799135ac5be07ff11dc60e29b31ee02ae7 (patch) | |
| tree | bf3275948f9edb097161c3f9cbba9f90bbb51947 | |
| parent | 063ffd2d6702ee08a47efa48a75f0cc1e0cfe34c (diff) | |
| parent | 206a59c8c30af06d2405fa41ad9c4ad6b9d3587c (diff) | |
| download | mariadb-git-a578ef799135ac5be07ff11dc60e29b31ee02ae7.tar.gz | |
Merge rkalimullin@work.mysql.com:/home/bk/mysql-4.1
into mysql.r18.ru:/usr/home/ram/mysql-4.1
| -rw-r--r-- | include/my_tree.h | 2 | ||||
| -rw-r--r-- | mysys/tree.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index 05e93df8593..99194907ef9 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -91,7 +91,7 @@ void *tree_search_edge(TREE *tree, TREE_ELEMENT **parents, TREE_ELEMENT ***last_pos, int child_offs); void *tree_search_next(TREE *tree, TREE_ELEMENT ***last_pos, int l_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); #ifdef __cplusplus } 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) { |