diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-05-05 15:23:47 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-05-05 15:23:47 +0200 |
| commit | 1d3ea9ecd8c7f7e022eb4ee5e98326fc850d59b1 (patch) | |
| tree | f9abc493fa045bb684b884b81ae58c94e3e8ea38 /sql/event_scheduler.cc | |
| parent | dd0207bda440c2e44ba5223d0635538bc2974890 (diff) | |
| parent | d71d4119055f0184f5edd24e86fa3d6a5c71aa89 (diff) | |
| download | mariadb-git-1d3ea9ecd8c7f7e022eb4ee5e98326fc850d59b1.tar.gz | |
perfschema 5.6.24
including the big commit
commit 305130361bf72726de220f3d2b2787395e10be61
Author: Marc Alff <marc.alff@oracle.com>
Date: Tue Feb 10 11:31:32 2015 +0100
WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6
(with the following commits) and related changes in sql/
Diffstat (limited to 'sql/event_scheduler.cc')
| -rw-r--r-- | sql/event_scheduler.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc index f2b3a77f414..5c4926c830c 100644 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -301,6 +301,9 @@ Event_worker_thread::run(THD *thd, Event_queue_element_for_exec *event) Event_job_data job_data; bool res; + DBUG_ASSERT(thd->m_digest == NULL); + DBUG_ASSERT(thd->m_statement_psi == NULL); + thd->thread_stack= &my_stack; // remember where our stack is res= post_init_event_thread(thd); @@ -329,6 +332,8 @@ Event_worker_thread::run(THD *thd, Event_queue_element_for_exec *event) job_data.definer.str, job_data.dbname.str, job_data.name.str); end: + DBUG_ASSERT(thd->m_statement_psi == NULL); + DBUG_ASSERT(thd->m_digest == NULL); DBUG_PRINT("info", ("Done with Event %s.%s", event->dbname.str, event->name.str)); |