Commit 278c29e5 authored by marko's avatar marko

innobase_commit(): Correct the comments and formatting that were broken when

innodb_commit_concurrency was implemented.
parent 4f1615b7
...@@ -1846,9 +1846,8 @@ innobase_commit( ...@@ -1846,9 +1846,8 @@ innobase_commit(
/* Update the info whether we should skip XA steps that eat CPU time */ /* Update the info whether we should skip XA steps that eat CPU time */
trx->support_xa = (ibool)(thd->variables.innodb_support_xa); trx->support_xa = (ibool)(thd->variables.innodb_support_xa);
/* Release a possible FIFO ticket and search latch. Since we will /* Since we will reserve the kernel mutex, we have to release
reserve the kernel mutex, we have to release the search system latch the search system latch first to obey the latching order. */
first to obey the latching order. */
if (trx->has_search_latch) { if (trx->has_search_latch) {
trx_search_latch_release_if_reserved(trx); trx_search_latch_release_if_reserved(trx);
...@@ -1938,13 +1937,14 @@ innobase_commit( ...@@ -1938,13 +1937,14 @@ innobase_commit(
trx_mark_sql_stat_end(trx); trx_mark_sql_stat_end(trx);
} }
/* Tell the InnoDB server that there might be work for utility
threads: */
if (trx->declared_to_be_inside_innodb) { if (trx->declared_to_be_inside_innodb) {
/* Release our possible ticket in the FIFO */ /* Release our possible ticket in the FIFO */
srv_conc_force_exit_innodb(trx); srv_conc_force_exit_innodb(trx);
} }
/* Tell the InnoDB server that there might be work for utility
threads: */
srv_active_wake_master_thread(); srv_active_wake_master_thread();
DBUG_RETURN(0); DBUG_RETURN(0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment