diff options
| author | monty@mashka.mysql.fi <> | 2003-01-21 21:28:51 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-21 21:28:51 +0200 |
| commit | 7436e9ec97feed09bbda0c3a8b58c6f1f30ca243 (patch) | |
| tree | 746b47095ebdcc9cd407758fe0edc8f9e2495e33 /mysys | |
| parent | 49580a5168470a03cf4381b48669a6c821163519 (diff) | |
| parent | 4fd9bad4cc03050c1c91b22f5660469ea8b97cca (diff) | |
| download | mariadb-git-7436e9ec97feed09bbda0c3a8b58c6f1f30ca243.tar.gz | |
Merge
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_once.c | 1 | ||||
| -rw-r--r-- | mysys/tree.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mysys/my_once.c b/mysys/my_once.c index e1c728897aa..a4201810b03 100644 --- a/mysys/my_once.c +++ b/mysys/my_once.c @@ -23,6 +23,7 @@ #include "mysys_priv.h" #include "my_static.h" #include "mysys_err.h" +#include <m_string.h> /* Alloc for things we don't nead to free diff --git a/mysys/tree.c b/mysys/tree.c index 4b14ffd7112..a3b69ebff5e 100644 --- a/mysys/tree.c +++ b/mysys/tree.c @@ -455,7 +455,7 @@ void *tree_search_next(TREE *tree, TREE_ELEMENT ***last_pos, int l_offs, (each path from root to leaf has the same length) */ 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; TREE_ELEMENT *element= tree->root; @@ -470,7 +470,7 @@ ha_rows tree_record_pos(TREE *tree, const void *key, { switch (flag) { case HA_READ_KEY_EXACT: - last_equal_pos= (left + right) / 2; + last_equal_pos= (ha_rows) ((left + right) / 2); cmp= 1; break; case HA_READ_BEFORE_KEY: @@ -498,9 +498,9 @@ ha_rows tree_record_pos(TREE *tree, const void *key, case HA_READ_KEY_EXACT: return last_equal_pos; case HA_READ_BEFORE_KEY: - return (uint) right; + return (ha_rows) right; case HA_READ_AFTER_KEY: - return (uint) left; + return (ha_rows) left; default: return HA_POS_ERROR; } |