diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:05:52 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 09:05:52 +0300 |
commit | acf6f92aa936fbfe7524617ae57d011ab8f1f96d (patch) | |
tree | e7fc2258c06a0fdab1cce115de4d71a091d82d28 /sql/handler.cc | |
parent | 765ae6e82165d1bc4cf6cc9f0d556d66a5e172d1 (diff) | |
parent | bc145193c164b895a52b943e73fff53952d48a60 (diff) | |
download | mariadb-git-acf6f92aa936fbfe7524617ae57d011ab8f1f96d.tar.gz |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index f2ea9365974..6329774668f 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2048,6 +2048,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) |