diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 13:14:31 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 13:14:31 +0200 |
commit | 908ca4668d5cb415f4737c8617ffb84f2c15855d (patch) | |
tree | 97b0b5322c3833d5d66e6a8b0c6de195aca18320 /include | |
parent | 5d3bd2b75b5bf32e69a9b32333cbf8dffe7a2541 (diff) | |
parent | 90451a59811b415a443aab97230e694856392cb5 (diff) | |
download | mariadb-git-908ca4668d5cb415f4737c8617ffb84f2c15855d.tar.gz |
Merge 10.2 into 10.3
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 |