diff options
| author | unknown <monty@mysql.com> | 2004-03-17 10:36:12 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-17 10:36:12 +0200 |
| commit | 219bbd5232d6ff958f97b30abbc0cb9646abf6a8 (patch) | |
| tree | 6f4235e7fd4eb101374c74e2c3c02470bb69d2ab /include/my_tree.h | |
| parent | b523802138eef0c66d6ce89263b512c1494a277b (diff) | |
| parent | b54698374b5eea922a6f054338d804c2ba3aa682 (diff) | |
| download | mariadb-git-219bbd5232d6ff958f97b30abbc0cb9646abf6a8.tar.gz | |
merge with 4.0
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/page/page0cur.c:
Auto merged
innobase/que/que0que.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/t/func_if.test:
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..0159dc891e5 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_HIGHT/2) leafs */ +#define MAX_TREE_HIGHT 64 + #define ELEMENT_KEY(tree,element)\ (tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\ *((void**) (element+1))) |