diff options
| author | unknown <monty@mysql.com> | 2004-05-11 12:21:38 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-05-11 12:21:38 +0300 |
| commit | 19f41e6e0df2d875cff2404f9bbbab30d81b72b1 (patch) | |
| tree | 0752eb9dfe0f1e306cf9a542e09d9cc646c11a0f /include/my_tree.h | |
| parent | cb24e8b9b29f1aa3edfc4d7a61a9d842cb48ca69 (diff) | |
| parent | f3d691a970627f34ed825a9cf7b84520dcdd43b3 (diff) | |
| download | mariadb-git-19f41e6e0df2d875cff2404f9bbbab30d81b72b1.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql-bench/limits/mysql-4.0.cfg:
Auto merged
Diffstat (limited to 'include/my_tree.h')
| -rw-r--r-- | include/my_tree.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index 0e705e19bba..14d8593b6dc 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -22,7 +22,9 @@ extern "C" { #include "my_base.h" /* get 'enum ha_rkey_function' */ -#define MAX_TREE_HEIGHT 40 /* = max 1048576 leafs in tree */ +/* Worst case tree is half full. This gives use 2^(MAX_TREE_HEIGHT/2) leafs */ +#define MAX_TREE_HEIGHT 64 + #define ELEMENT_KEY(tree,element)\ (tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\ *((void**) (element+1))) |