diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-10-16 23:48:59 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-10-16 23:48:59 +0200 |
| commit | c4776d3b2abfd5d1cf1d4d093067718e66a279fc (patch) | |
| tree | e823d9b586d14698ab36383a12fbfadd4d03ea72 /sql/rpl_parallel.cc | |
| parent | ed4a6f12b3db90de2168273871e7153fb458aee6 (diff) | |
| parent | 50f19ca8099994e992e1b411c7c05287855a7bdd (diff) | |
| download | mariadb-git-0.1.tar.gz | |
Merge "remove unnecessary global mutex in parallel replication" into 10.1.0.1
Diffstat (limited to 'sql/rpl_parallel.cc')
| -rw-r--r-- | sql/rpl_parallel.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index 761471fc1cb..c507a132374 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -47,9 +47,7 @@ rpt_handle_event(rpl_parallel_thread::queued_event *qev, if (!(ev->is_artificial_event() || ev->is_relay_log_event() || (ev->when == 0))) rgi->last_master_timestamp= ev->when + (time_t)ev->exec_time; - mysql_mutex_lock(&rli->data_lock); - /* Mutex will be released in apply_event_and_update_pos(). */ - err= apply_event_and_update_pos(ev, thd, rgi, rpt); + err= apply_event_and_update_pos_for_parallel(ev, thd, rgi); thread_safe_increment64(&rli->executed_entries); /* ToDo: error handling. */ |