database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2016-03-21 13:02:53 +01:00
parent e7cf898d6d 22ebf3cb45
commit 3b0c7ac1f9
142 changed files with 383 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/rpl_parallel.cc
View File

@@ -705,7 +705,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
@@ -1128,7 +1128,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);
@@ -1189,7 +1189,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