diff options
author | Otto Kekäläinen <otto@seravo.fi> | 2016-03-04 02:09:37 +0200 |
---|---|---|
committer | Otto Kekäläinen <otto@seravo.fi> | 2016-03-04 02:09:37 +0200 |
commit | 1777fd5f556a9c68cae01ad2aadaf4865984e649 (patch) | |
tree | 931f4a045467951a6ef8833631d6f0aeb04b53c3 /sql/rpl_parallel.cc | |
parent | f8251911a44f6b65c2377e9945e208e240dfec33 (diff) | |
download | mariadb-git-1777fd5f556a9c68cae01ad2aadaf4865984e649.tar.gz |
Fix spelling: occurred, execute, which etc
Diffstat (limited to 'sql/rpl_parallel.cc')
-rw-r--r-- | sql/rpl_parallel.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index b2e957a3e6e..98712f18c1b 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -698,7 +698,7 @@ do_retry: thd->clear_error(); /* - If we retry due to a deadlock kill that occured during the commit step, we + If we retry due to a deadlock kill that occurred during the commit step, we might have already updated (but not committed) an update of table mysql.gtid_slave_pos, and cleared the gtid_pending flag. Now we have rolled back any such update, so we must set the gtid_pending flag back to @@ -1100,7 +1100,7 @@ handle_rpl_parallel_thread(void *arg) /* Register ourself to wait for the previous commit, if we need to do such registration _and_ that previous commit has not already - occured. + occurred. */ register_wait_for_prior_event_group_commit(rgi, entry); @@ -1149,7 +1149,7 @@ handle_rpl_parallel_thread(void *arg) { /* Do an extra check for (deadlock) kill here. This helps prevent a - lingering deadlock kill that occured during normal DML processing to + lingering deadlock kill that occurred during normal DML processing to propagate past the mark_start_commit(). If we detect a deadlock only after mark_start_commit(), we have to unmark, which has at least a theoretical possibility of leaving a window where it looks like all |