diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-12 17:20:23 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-12 17:20:23 +0200 |
| commit | c51f85f8823a845cd4a6aa1b2aa5af18484b2ab0 (patch) | |
| tree | 65c45f6100c13dad90c33b86dc68be268139b0b8 /include | |
| parent | a89f199c64a1d2339de7c167ce64ec148061a4d3 (diff) | |
| parent | 8ce702aa90c174566f4ac950e85cc7570bf9b647 (diff) | |
| download | mariadb-git-c51f85f8823a845cd4a6aa1b2aa5af18484b2ab0.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_tree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_tree.h b/include/my_tree.h index e175492431e..48bbc5162f8 100644 --- a/include/my_tree.h +++ b/include/my_tree.h @@ -59,7 +59,7 @@ typedef struct st_tree_element { #define ELEMENT_CHILD(element, offs) (*(TREE_ELEMENT**)((char*)element + offs)) typedef struct st_tree { - TREE_ELEMENT *root,null_element; + TREE_ELEMENT *root; TREE_ELEMENT **parents[MAX_TREE_HEIGHT]; uint offset_to_key,elements_in_tree,size_of_element; size_t memory_limit, allocated; |