diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-02-10 17:01:45 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-02-10 17:01:45 +0100 |
| commit | 2195bb4e416232ab807ff67eecf03b1223bf6bff (patch) | |
| tree | 4555af02df68cb0f26d454b1cf65086b62542875 /sql/log_event.cc | |
| parent | 3ae038b732ce503fb839e9095355e05f5c6866f9 (diff) | |
| parent | bc4686f0f4d17dc57dd727c9f5390caa3022bdca (diff) | |
| download | mariadb-git-2195bb4e416232ab807ff67eecf03b1223bf6bff.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 893781223fb..291b550353d 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -7922,6 +7922,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; } |