diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2009-07-24 21:04:55 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2009-07-24 21:04:55 +0500 |
| commit | 2bc6b6a80099ddb5b57e3d3c8be120e6596daa08 (patch) | |
| tree | 999d090b1f7c4cb9c23b5e41592e0cec56389c5f /sql/event_scheduler.cc | |
| parent | c24cccabdda8fad2117e3dea39e4de3c7feb3157 (diff) | |
| parent | dc0a87fdc24ed0859856d243ad68a0c1913db3af (diff) | |
| download | mariadb-git-2bc6b6a80099ddb5b57e3d3c8be120e6596daa08.tar.gz | |
Merge from 5.0
******
manual merge 5.0-bugteam --> 5.1-bugteam (bug 38816)
Diffstat (limited to 'sql/event_scheduler.cc')
| -rw-r--r-- | sql/event_scheduler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc index d9d010783e8..78aad2b4c3d 100644 --- a/sql/event_scheduler.cc +++ b/sql/event_scheduler.cc @@ -625,13 +625,13 @@ Event_scheduler::stop() DBUG_PRINT("info", ("Scheduler thread has id %lu", scheduler_thd->thread_id)); /* Lock from delete */ - pthread_mutex_lock(&scheduler_thd->LOCK_delete); + pthread_mutex_lock(&scheduler_thd->LOCK_thd_data); /* This will wake up the thread if it waits on Queue's conditional */ sql_print_information("Event Scheduler: Killing the scheduler thread, " "thread id %lu", scheduler_thd->thread_id); scheduler_thd->awake(THD::KILL_CONNECTION); - pthread_mutex_unlock(&scheduler_thd->LOCK_delete); + pthread_mutex_unlock(&scheduler_thd->LOCK_thd_data); /* thd could be 0x0, when shutting down */ sql_print_information("Event Scheduler: " |