diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 09:31:42 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-31 09:31:42 +0100 |
| commit | c3a5cf2b5bb0c0e1623a0ddc8e3d49557f35e800 (patch) | |
| tree | 0e47046f09c1ad4a4223e45d7ac2c41406272b92 /sql/log.cc | |
| parent | 81196469bbc6b8424c97a378e5fc5b16d40b43b5 (diff) | |
| parent | f8a85af8ca1c937b8d4f847477bd282f80251cde (diff) | |
| download | mariadb-git-c3a5cf2b5bb0c0e1623a0ddc8e3d49557f35e800.tar.gz | |
Merge branch '10.5' into 10.6
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index 4fff1e3d3aa..0625e2d5c1b 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1681,6 +1681,7 @@ int binlog_init(void *p) binlog_hton->prepare= binlog_prepare; binlog_hton->start_consistent_snapshot= binlog_start_consistent_snapshot; } + binlog_hton->flags= HTON_NOT_USER_SELECTABLE | HTON_HIDDEN | HTON_NO_ROLLBACK; return 0; } @@ -1999,7 +2000,9 @@ int binlog_commit_by_xid(handlerton *hton, XID *xid) THD *thd= current_thd; if (thd->is_current_stmt_binlog_disabled()) - return 0; + { + return thd->wait_for_prior_commit(); + } /* the asserted state can't be reachable with xa commit */ DBUG_ASSERT(!thd->get_stmt_da()->is_error() || @@ -2031,7 +2034,9 @@ int binlog_rollback_by_xid(handlerton *hton, XID *xid) THD *thd= current_thd; if (thd->is_current_stmt_binlog_disabled()) - return 0; + { + return thd->wait_for_prior_commit(); + } if (thd->get_stmt_da()->is_error() && thd->get_stmt_da()->sql_errno() == ER_XA_RBROLLBACK) |