diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 13:44:56 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 13:44:56 +0200 |
commit | 928abd6967b7925c3cd7fdf53f31d0b0fb307e41 (patch) | |
tree | 805f388e65be49f60193bc470c0dd2b581e03198 /include | |
parent | d9899ce671b7a1d1c55993ab00c6b40d79d61b48 (diff) | |
parent | 908ca4668d5cb415f4737c8617ffb84f2c15855d (diff) | |
download | mariadb-git-928abd6967b7925c3cd7fdf53f31d0b0fb307e41.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'include')
-rw-r--r-- | include/heap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/heap.h b/include/heap.h index d0c907a48b4..ca6efa48f1b 100644 --- a/include/heap.h +++ b/include/heap.h @@ -246,7 +246,7 @@ int hp_panic(enum ha_panic_function flag); int heap_rkey(HP_INFO *info, uchar *record, int inx, const uchar *key, key_part_map keypart_map, enum ha_rkey_function find_flag); extern uchar * heap_find(HP_INFO *info,int inx,const uchar *key); -extern int heap_check_heap(HP_INFO *info, my_bool print_status); +extern int heap_check_heap(const HP_INFO *info, my_bool print_status); extern uchar *heap_position(HP_INFO *info); /* The following is for programs that uses the old HEAP interface where |