diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-04 14:52:25 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-04 14:52:25 +0200 |
commit | 8356fb68c366b7f515f9060d964ee598653756a6 (patch) | |
tree | 310d7419ad32f74ad29b3da87dd1a21ab4d39dd7 /include/heap.h | |
parent | b5a54e8a9305885e2850d6dabde08ad369094ff3 (diff) | |
parent | fe38d7cad4fab33beba90eefaea9e9d4aef06a7c (diff) | |
download | mariadb-git-8356fb68c366b7f515f9060d964ee598653756a6.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'include/heap.h')
-rw-r--r-- | include/heap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/heap.h b/include/heap.h index f0ac527976c..2e0e9357a3b 100644 --- a/include/heap.h +++ b/include/heap.h @@ -33,12 +33,12 @@ extern "C" { #include "my_compare.h" #include "my_tree.h" - /* defines used by heap-funktions */ + /* defines used by heap-functions */ #define HP_MAX_LEVELS 4 /* 128^5 records is enough */ #define HP_PTRS_IN_NOD 128 - /* struct used with heap_funktions */ + /* struct used with heap_functions */ typedef struct st_heapinfo /* Struct from heap_info */ { @@ -107,7 +107,7 @@ typedef struct st_heap_block ulong last_allocated; /* number of records there is allocated space for */ } HP_BLOCK; -struct st_heap_info; /* For referense */ +struct st_heap_info; /* For reference */ typedef struct st_hp_keydef /* Key definition with open */ { |