diff options
author | unknown <andrey@whirlpool.mysql.com> | 2007-05-21 10:51:11 +0200 |
---|---|---|
committer | unknown <andrey@whirlpool.mysql.com> | 2007-05-21 10:51:11 +0200 |
commit | 3da4eef70072d713700219fb061cc497235477a3 (patch) | |
tree | fe97a37c60c26ae6368008b0300c3e22cc8dffc8 /sql/event_scheduler.cc | |
parent | 3d01594f349a540068943b1ba7ddea2ec2e448ef (diff) | |
download | mariadb-git-3da4eef70072d713700219fb061cc497235477a3.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.
sql/event_queue.cc:
Initialize member variables or they will point to
nirvana and could possible cause a crash during
dumping of debug information.
sql/event_queue.h:
remove unneeded line
sql/event_scheduler.cc:
Initialize member variables or they will point to
nirvana and could possible cause a crash during
dumping of debug information.
sql/event_scheduler.h:
remove unneeded state
Diffstat (limited to 'sql/event_scheduler.cc')
-rw-r--r-- | sql/event_scheduler.cc | 9 |
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); |