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

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2016-12-11 09:53:42 +01:00
parent a629b5172e eb4f2e063c
commit 2f20d297f8
150 changed files with 2247 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/rpl_parallel.cc
View File

@@ -2758,7 +2758,6 @@ rpl_parallel::do_event(rpl_group_info *serial_rgi, Log_event *ev,
/*
Queue the event for processing.
*/
rli->event_relay_log_pos= rli->future_event_relay_log_pos;
qev->ir= rli->last_inuse_relaylog;
++qev->ir->queued_count;
cur_thread->enqueue(qev);