summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-03-17 10:36:12 +0200
committermonty@mysql.com <>2004-03-17 10:36:12 +0200
commitf9ad65049088dc58591c954903a22e527e96ea5a (patch)
tree6f4235e7fd4eb101374c74e2c3c02470bb69d2ab /include
parent44667503b75b539e43a057743f7baefce418d4d6 (diff)
parente8c65b886d91eded17d3aa859da831fd04877549 (diff)
downloadmariadb-git-f9ad65049088dc58591c954903a22e527e96ea5a.tar.gz
merge with 4.0
Diffstat (limited to 'include')
-rw-r--r--include/my_tree.h4
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)))