Skip to content

Commit

Permalink
Merge branch '10.0' into 10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
knielsen committed Jan 17, 2017
2 parents 30a9ac4 + 3e589d4 commit 719e811
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions sql/log_event.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7107,6 +7107,7 @@ Gtid_list_log_event::do_apply_event(rpl_group_info *rgi)
rli->abort_slave= true;
rli->stop_for_until= true;
}
free_root(thd->mem_root, MYF(MY_KEEP_PREALLOC));
return ret;
}

Expand Down

0 comments on commit 719e811

Please sign in to comment.