diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-04 17:04:55 +0200 |
| commit | 8cbb14ef5d180687f131bc44a4e8fc84083d033c (patch) | |
| tree | 091f11e2d20f95656a7b12294782eb0488fd4fcc /include | |
| parent | 4345868382ca3525de5eb432302b6b9b957b47c1 (diff) | |
| parent | b85aa20065504bdda4bc03c2bd7eb7de38865c5d (diff) | |
| download | mariadb-git-8cbb14ef5d180687f131bc44a4e8fc84083d033c.tar.gz | |
Merge branch '10.1' into 10.2
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 02cab02b52e..59d02218a21 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; |