summaryrefslogtreecommitdiff
path: root/sql/event_scheduler.cc
diff options
context:
space:
mode:
authorandrey@whirlpool.mysql.com <>2007-05-21 10:51:11 +0200
committerandrey@whirlpool.mysql.com <>2007-05-21 10:51:11 +0200
commitce856126d9d53c4053e34451d00e312c4aeff2a5 (patch)
treefe97a37c60c26ae6368008b0300c3e22cc8dffc8 /sql/event_scheduler.cc
parent43894d62f1b098aa79584e6da9da7547191d4f62 (diff)
downloadmariadb-git-ce856126d9d53c4053e34451d00e312c4aeff2a5.tar.gz
Fix for bug#28075 COM_DEBUG crashes mysqld
Uninitialized in the constructor member variables were pointing to nirvana and causing a crash when debug information of the Event Scheduler was dumped in result to COM_DEBUG packet sent to the server.
Diffstat (limited to 'sql/event_scheduler.cc')
-rw-r--r--sql/event_scheduler.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/event_scheduler.cc b/sql/event_scheduler.cc
index 5844fecc227..478ae0098da 100644
--- a/sql/event_scheduler.cc
+++ b/sql/event_scheduler.cc
@@ -42,7 +42,6 @@ Event_db_repository *Event_worker_thread::db_repository;
static
const LEX_STRING scheduler_states_names[] =
{
- { C_STRING_WITH_LEN("UNINITIALIZED") },
{ C_STRING_WITH_LEN("INITIALIZED") },
{ C_STRING_WITH_LEN("RUNNING") },
{ C_STRING_WITH_LEN("STOPPING") }
@@ -331,9 +330,15 @@ end:
Event_scheduler::Event_scheduler(Event_queue *queue_arg)
- :state(UNINITIALIZED),
+ :state(INITIALIZED),
scheduler_thd(NULL),
queue(queue_arg),
+ mutex_last_locked_at_line(0),
+ mutex_last_unlocked_at_line(0),
+ mutex_last_locked_in_func("n/a"),
+ mutex_last_unlocked_in_func("n/a"),
+ mutex_scheduler_data_locked(FALSE),
+ waiting_on_cond(FALSE),
started_events(0)
{
pthread_mutex_init(&LOCK_scheduler_state, MY_MUTEX_INIT_FAST);