database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2023-01-03 17:08:42 +02:00
parent c4938eafc5 fb0808c450
commit 8b9b4ab3f5
168 changed files with 3018 additions and 2202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/heap.h
View File

@@ -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 */
{