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/slave.h | |
| 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/slave.h')
| -rw-r--r-- | sql/slave.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/slave.h b/sql/slave.h index e8a925ce560..a78ae4cff6f 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -243,8 +243,9 @@ void set_slave_thread_default_charset(THD *thd, rpl_group_info *rgi); int rotate_relay_log(Master_info* mi); int has_temporary_error(THD *thd); int apply_event_and_update_pos(Log_event* ev, THD* thd, - struct rpl_group_info *rgi, - rpl_parallel_thread *rpt); + struct rpl_group_info *rgi); +int apply_event_and_update_pos_for_parallel(Log_event* ev, THD* thd, + struct rpl_group_info *rgi); pthread_handler_t handle_slave_io(void *arg); void slave_output_error_info(rpl_group_info *rgi, THD *thd); |