summaryrefslogtreecommitdiff
path: root/include/heap.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 17:08:42 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2023-01-03 17:08:42 +0200
commit8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d (patch)
tree3e2c81b24b86a194243fe3e7913393e96de99991 /include/heap.h
parentc4938eafc594d6d64e5a17be13c337ada0beb63d (diff)
parentfb0808c450849e00993fa38839f33969a9daf7e8 (diff)
downloadmariadb-git-8b9b4ab3f59f86e1c8f6cd6a0e6b8916db61933d.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'include/heap.h')
-rw-r--r--include/heap.h6
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 */
{