diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-24 12:03:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-24 12:03:11 +0300 |
| commit | bfb0726fc24acb896e54bc7ef7536ad1aab9d574 (patch) | |
| tree | a48e5d91d8427fefe2121128a4b3416d8d76e8a3 /sql/handler.cc | |
| parent | 9dcfd6be94bd83d14fd48d69ce487eb0ea3fe37f (diff) | |
| parent | d5da8ae04d57556f517c0f03afeafe73c6cc75d1 (diff) | |
| download | mariadb-git-bfb0726fc24acb896e54bc7ef7536ad1aab9d574.tar.gz | |
Merge 5.5 into 10.1
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 f307b3895bc..87331a41db6 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -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) |