Skip to content

Commit 0891453

Browse files
committed
Merge branch 'mysql-5.6' into mysql-5.7
Change-Id: Ia73e876d22fa73a2f960dda616bbc176c82563ed
2 parents 04c8483 + f472acc commit 0891453

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

sql/event_scheduler.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
1+
/* Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
22
33
This program is free software; you can redistribute it and/or modify
44
it under the terms of the GNU General Public License, version 2.0,
@@ -544,6 +544,7 @@ Event_scheduler::run(THD *thd)
544544
DBUG_PRINT("info", ("job_data is NULL, the thread was killed"));
545545
}
546546
DBUG_PRINT("info", ("state=%s", scheduler_states_names[state].str));
547+
free_root(thd->mem_root, MYF(0));
547548
}
548549

549550
LOCK_DATA();

0 commit comments

Comments
 (0)