diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-02 08:44:17 +0200 |
| commit | ca091e6372c4d1b05d2338e878042c2914519a4e (patch) | |
| tree | 406c71091eb4fdf4409147d22e6749309f677e8e /sql/event_scheduler.cc | |
| parent | 28325b08633372cc343dfcbc41fe252020cf6e6e (diff) | |
| parent | d233fd14a39f9c583b85ffb03e42b5ea52e2f4c2 (diff) | |
| download | mariadb-git-ca091e6372c4d1b05d2338e878042c2914519a4e.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/event_scheduler.cc')
| -rw-r--r-- | sql/event_scheduler.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc index f680163c49a..2a5399fb94a 100644 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -1,4 +1,5 @@ -/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. +/* Copyright (c) 2006, 2019, Oracle and/or its affiliates. + Copyright (c) 2009, 2020, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -497,6 +498,7 @@ Event_scheduler::run(THD *thd) DBUG_PRINT("info", ("job_data is NULL, the thread was killed")); } DBUG_PRINT("info", ("state=%s", scheduler_states_names[state].str)); + free_root(thd->mem_root, MYF(0)); } LOCK_DATA(); |