database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 5.5 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2019-04-24 12:03:11 +03:00
parent 9dcfd6be94 d5da8ae04d
commit bfb0726fc2
20 changed files with 495 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/handler.cc
View File

@ -1949,6 +1949,7 @@ int ha_recover(HASH *commit_list)
for (info.len= MAX_XID_LIST_SIZE ;
info.list==0 && info.len > MIN_XID_LIST_SIZE; info.len/=2)
{
DBUG_EXECUTE_IF("min_xa_len", info.len = 16;);
info.list=(XID *)my_malloc(info.len*sizeof(XID), MYF(0));
}
if (!info.list)