summaryrefslogtreecommitdiff
path: root/include/my_tree.h
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-06-04 11:39:33 +0300
committerunknown <monty@hundin.mysql.fi>2002-06-04 11:39:33 +0300
commitfa86b948379ca3929ebd8a7b941d6c2fbb26f8ec (patch)
treecb48233048aee1e7e30a1c0a68353e10a1fb6564 /include/my_tree.h
parent7aef75a9a9b3f1965f1989bf224d8c9ba0090f86 (diff)
parentf45dc577290c7298b33ba70eba1c8a80037201ff (diff)
downloadmariadb-git-fa86b948379ca3929ebd8a7b941d6c2fbb26f8ec.tar.gz
Merge work:/my/mysql-4.1 into hundin.mysql.fi:/my/mysql-4.1
heap/hp_write.c: Auto merged include/my_tree.h: Auto merged mysys/charset.c: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_yacc.yy: Auto merged
Diffstat (limited to 'include/my_tree.h')
-rw-r--r--include/my_tree.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_tree.h b/include/my_tree.h
index bfe441f54a6..05e93df8593 100644
--- a/include/my_tree.h
+++ b/include/my_tree.h
@@ -20,6 +20,8 @@
extern "C" {
#endif
+#include "my_base.h" /* get 'enum ha_rkey_function' */
+
#define MAX_TREE_HEIGHT 40 /* = max 1048576 leafs in tree */
#define ELEMENT_KEY(tree,element)\
(tree->offset_to_key ? (void*)((byte*) element+tree->offset_to_key) :\