diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-05-11 14:05:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-05-11 14:05:52 +0300 |
| commit | cd5ca0b11882cfa8eafa8c687ed3084423bc7e52 (patch) | |
| tree | 92045e255e18d9acbe7cd8385c64c9f1830db257 /sql/sql_sequence.cc | |
| parent | 78a1264cfae37667a2812c5bb5cc6638d9eed5ff (diff) | |
| parent | c271057288f71746d1816824f338f2d9c47f67c1 (diff) | |
| download | mariadb-git-bb-10.6-MDEV-29911.tar.gz | |
Merge 10.6bb-10.6-MDEV-29911
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)) |