summaryrefslogtreecommitdiff
path: root/sql/event_data_objects.h
diff options
context:
space:
mode:
authorunknown <andrey@lmy004.>2006-07-04 18:44:35 +0200
committerunknown <andrey@lmy004.>2006-07-04 18:44:35 +0200
commita5dfeb02e991e6e5e9e332443522de1bb4592df8 (patch)
tree4459403077605a188dd88b131d998654761070d2 /sql/event_data_objects.h
parent377446fa3497ffbc0f2a17614d848bfb79f52662 (diff)
downloadmariadb-git-a5dfeb02e991e6e5e9e332443522de1bb4592df8.tar.gz
WL #3337 (Event scheduler new architecture)
Cut Nr. 8. All tests pass. Separated Event_scheduler into Event_queue and Event_scheduler. Added new Event_scheduler_ng which is the new scheduler and is used system-wide. Will be moved to the event_scheduler.cc in the future. Using Event_timed in Event_queue as well as cloned during execution. Next step is to have Event_worker_data which will be used during execution and will take ::compile()/::execute() out of Event_timed. mysql-test/r/events.result: update result mysql-test/r/events_bugs.result: update result mysql-test/r/ps_1general.result: update result mysql-test/r/skip_name_resolve.result: update result mysql-test/r/sp-threads.result: update result mysql-test/r/sp_notembedded.result: update result mysql-test/r/status.result: update result mysql-test/t/events_stress.test: Make event_stress a bit longer sql/Makefile.am: Add new event_scheduler_ng.h/cc . These are only to be in the experimental clone. Later their content will be moved to event_scheduler.h/cc sql/event_data_objects.cc: Allocate strings memory on own memory root, instead on the schedulers. Thus don't "leak" memory. This should fix bug#18683 memory leak in event scheduler sql/event_data_objects.h: add mem_root add THD - this is only temporal, will be moved to class Event_job_data once Event_job_data is responsible for the execution. sql/event_db_repository.cc: Remove unused code. Cosmetic changes sql/event_queue.cc: Now use the Event_scheduler_ng (NextGen) sql/event_queue.h: Now use the Event_scheduler_ng (NextGen) sql/event_scheduler.cc: This file is no more used, but will be soon. sql/event_scheduler.h: This file is no more used but will be soon sql/events.cc: Now use the Event_scheduler_ng (NextGen) sql/events.h: Now use the Event_scheduler_ng (NextGen) sql/mysqld.cc: Make it again possible to kill the scheduler thread sql/set_var.cc: Now use the Event_scheduler_ng (NextGen) sql/share/errmsg.txt: Shorten the message. sql/sql_show.cc: Loading is on a own root, then don't use thd->mem_root
Diffstat (limited to 'sql/event_data_objects.h')
-rw-r--r--sql/event_data_objects.h33
1 files changed, 30 insertions, 3 deletions
diff --git a/sql/event_data_objects.h b/sql/event_data_objects.h
index d8df8dd1e6c..5ae5c7e81ab 100644
--- a/sql/event_data_objects.h
+++ b/sql/event_data_objects.h
@@ -72,8 +72,11 @@ class Event_timed
bool status_changed;
bool last_executed_changed;
+
+ MEM_ROOT mem_root;
public:
+ THD *thd;
enum enum_status
{
ENABLED = 1,
@@ -147,7 +150,7 @@ public:
deinit_mutexes();
int
- load_from_row(MEM_ROOT *mem_root, TABLE *table);
+ load_from_row(TABLE *table);
bool
compute_next_execution_time();
@@ -264,9 +267,33 @@ public:
};
-class Event_queue_element : public Event_timed
+class Event_job_data
{
+public:
+ LEX_STRING dbname;
+ LEX_STRING name;
+ sp_head *sphead;
+ LEX_STRING definer;
+ LEX_STRING body;
+ ulong sql_mode;
-};
+ THD *thd;
+
+ Event_job_data(){}
+ ~Event_job_data(){}
+ int
+ execute();
+
+private:
+ int
+ load_from_disk();
+
+ int
+ compile();
+
+
+ Event_job_data(const Event_job_data &); /* Prevent use of these */
+ void operator=(Event_job_data &);
+};
#endif /* _EVENT_DATA_OBJECTS_H_ */