mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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
This commit is contained in:
@ -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)))
|
||||
|
Reference in New Issue
Block a user