Merge branch '10.0' into 10.1

719e8113 · Kristian Nielsen · 30a9ac42 · 3e589d4b · 719e8113
Commit 719e8113 authored Jan 17, 2017 by Kristian Nielsen
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

sql/log_event.cc sql/log_event.cc +1 -0

No files found.
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -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;
 }