summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2018-02-04 18:40:06 +0400
committerAlexander Barkov <bar@mariadb.org>2018-02-04 18:40:06 +0400
commit217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299 (patch)
tree83093666c427b4770d82c0ff44f0d7034bec13a8 /sql/log.cc
parentd6ed077fc82c2f4d20895db9a6b16ca295f23c33 (diff)
parent28d4cf0c1b3366c6471866d144ef28fced1e5390 (diff)
downloadmariadb-git-217fc122c8e893aa48fa5dcfb3dbfcc99a2aa299.tar.gz
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index c709734028d..dfbe2c33e2e 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -10005,7 +10005,8 @@ int TC_LOG_BINLOG::recover(LOG_INFO *linfo, const char *last_log_name,
goto err1;
if (do_xa)
- init_alloc_root(&mem_root, TC_LOG_PAGE_SIZE, TC_LOG_PAGE_SIZE, MYF(0));
+ init_alloc_root(&mem_root, "TC_LOG_BINLOG", TC_LOG_PAGE_SIZE,
+ TC_LOG_PAGE_SIZE, MYF(0));
fdle->flags&= ~LOG_EVENT_BINLOG_IN_USE_F; // abort on the first error