diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-02 13:54:54 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-02 13:54:54 +0200 |
| commit | edf8ce5b9741520cd5b3e559af2dd7cace6b4af9 (patch) | |
| tree | 20ce88b147bc64be1ab6206714d6fbcd3f40c530 /sql/sql_sequence.cc | |
| parent | d821fd7fab2723b84f774aaa4882acb86b35769d (diff) | |
| parent | edd0b03e60f4cc666fbdf16e7b01b97188f2f887 (diff) | |
| download | mariadb-git-edf8ce5b9741520cd5b3e559af2dd7cace6b4af9.tar.gz | |
Merge branch 'bb-10.4-release' into bb-10.5-release
Diffstat (limited to 'sql/sql_sequence.cc')
| -rw-r--r-- | sql/sql_sequence.cc | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc index 60da595afd0..fdb9c647727 100644 --- a/sql/sql_sequence.cc +++ b/sql/sql_sequence.cc @@ -1011,10 +1011,19 @@ bool Sql_cmd_alter_sequence::execute(THD *thd) else table->file->print_error(error, MYF(0)); seq->write_unlock(table); - if (trans_commit_stmt(thd)) - error= 1; - if (trans_commit_implicit(thd)) - error= 1; + { + wait_for_commit* suspended_wfc= thd->suspend_subsequent_commits(); + if (trans_commit_stmt(thd)) + error= 1; + if (trans_commit_implicit(thd)) + error= 1; + thd->resume_subsequent_commits(suspended_wfc); + DBUG_EXECUTE_IF("hold_worker_on_schedule", + { + /* delay binlogging of a parent trx in rpl_parallel_seq */ + my_sleep(100000); + }); + } if (likely(!error)) error= write_bin_log(thd, 1, thd->query(), thd->query_length()); if (likely(!error)) |