diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-07-12 14:42:48 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-07-12 14:42:48 +0200 |
| commit | 47f8e0ef6eb171119b092861ce1196bdedbd834c (patch) | |
| tree | cc7e49575d6164b742c2c5394ae2b0ac96b055f6 /sql/slave.cc | |
| parent | ba4b937af2e3c9118071b1279bc39b6febca73a9 (diff) | |
| download | mariadb-git-47f8e0ef6eb171119b092861ce1196bdedbd834c.tar.gz | |
MDEV-4506: Parallel replication: Intermediate commit
Remove Relay_log_info::group_info. (It is not thread safe).
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index a26010d75cc..777ab9c8468 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3264,7 +3264,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli, exec_res= apply_event_and_update_pos(ev, thd, serial_rgi, NULL); - delete_or_keep_event_post_apply(rli, typ, ev); + delete_or_keep_event_post_apply(serial_rgi, typ, ev); /* update_log_pos failed: this should not happen, so we don't @@ -4189,13 +4189,6 @@ log '%s' at position %s, relay log '%s' position: %s%s", RPL_LOG_NAME, } mysql_mutex_unlock(&rli->data_lock); - /* - ToDo: Get rid of this, all accesses to rpl_group_info must be made - per-worker-thread to work with parallel replication. - */ - if (opt_slave_parallel_threads <= 0) - rli->group_info= &serial_rgi; - /* Read queries from the IO/THREAD until this thread is killed */ while (!sql_slave_killed(thd,rli)) |