summaryrefslogtreecommitdiff
path: root/sql/event_data_objects.h
diff options
context:
space:
mode:
authorunknown <andrey@lmy004.>2006-07-17 16:52:45 +0200
committerunknown <andrey@lmy004.>2006-07-17 16:52:45 +0200
commite69e640f2eedfe1247f2a5f536d8dc1cf8a48300 (patch)
tree94cf5b188a961ae9067df17d09d62247d263ea81 /sql/event_data_objects.h
parentd65ab09c4dad097f0c8c5b9bf3856b6fdaf290fa (diff)
downloadmariadb-git-e69e640f2eedfe1247f2a5f536d8dc1cf8a48300.tar.gz
WL#3337 (Events new architecture)
Small updates before patch submit. client/mysqltest.c: allow --valgrind option to mysqltest so one can be able to detect whether the test is running under valgrind by having $VALGRIND_TEST, similar to BIG_TEST, in the test file. mysql-test/mysql-test-run.pl: If the test suite is running under valgrind start mysqltest with --valgrind to inform that we run valgrind. mysqltest will provide $VALGRIND_TEST for the test cases. mysql-test/r/events_bugs.result: update result mysql-test/r/events_scheduling.result: update result mysql-test/t/events.test: Increase times or the test will fail under valgrind mysql-test/t/events_bugs.test: Increase times or the test will fail under valgrind mysql-test/t/events_scheduling.test: Remove faulty test Disable the test case for valgrind sql/event_data_objects.cc: count the number of executions sql/event_data_objects.h: flags is not used at all add execution_count to count the number of executions sql/event_db_repository.cc: Initialize wherever needed. Add a comment regarding valgrind warning. sql/event_queue.cc: more debug info in the trace log sql/event_scheduler.cc: Use macro COND_STATE_WAIT() in all cases we need waiting on condition. Hence, we can trace locking, attemption to lock and more with SHOW SCHEDULER STATUS sql/event_scheduler.h: Change the declaration of cond_wait to accept THD sql/events.cc: fix memory leak. Destroy event_queue mysql-test/include/not_valgrind.inc: New BitKeeper file ``mysql-test/include/not_valgrind.inc'' mysql-test/r/not_valgrind.require: New BitKeeper file ``mysql-test/r/not_valgrind.require''
Diffstat (limited to 'sql/event_data_objects.h')
-rw-r--r--sql/event_data_objects.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/event_data_objects.h b/sql/event_data_objects.h
index cf1bd5e390a..a912953c927 100644
--- a/sql/event_data_objects.h
+++ b/sql/event_data_objects.h
@@ -74,9 +74,9 @@ public:
enum enum_status status;
TIME last_executed;
+ TIME execute_at;
TIME starts;
TIME ends;
- TIME execute_at;
my_bool starts_null;
my_bool ends_null;
my_bool execute_at_null;
@@ -84,10 +84,10 @@ public:
longlong expression;
interval_type interval;
- uint flags;//all kind of purposes
-
bool dropped;
+ uint execution_count;
+
Event_queue_element();
virtual ~Event_queue_element();
@@ -170,6 +170,8 @@ public:
ulong sql_mode;
+ uint execution_count;
+
Event_job_data();
virtual ~Event_job_data();