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ä
2021-01-25 12:44:24 +02:00
parent 5adcb2e7b8 3467f63764
commit 961c7938bb
62 changed files with 1128 additions and 283 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
storage/heap/ha_heap.cc
View File

@@ -367,9 +367,6 @@ int ha_heap::info(uint flag)
{
HEAPINFO hp_info;
if (!file)
return 0;
(void) heap_info(file,&hp_info,flag);
errkey= hp_info.errkey;