Merge branch '10.0' into 10.1

This commit is contained in:
Kristian Nielsen 2017-01-17 17:11:28 +01:00
commit 719e81132d

View File

@ -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;
}