summaryrefslogtreecommitdiff
path: root/sql/event_scheduler.h
diff options
context:
space:
mode:
authorunknown <andrey@lmy004.>2006-06-27 11:51:11 +0200
committerunknown <andrey@lmy004.>2006-06-27 11:51:11 +0200
commitef9a97e6856ec8128b66a47b124ce3c09f0fd1bc (patch)
tree7b795dc8246cf6e4fffc0272f2f6500ae979babe /sql/event_scheduler.h
parentd2db48c69bf473101cceffe8305a5922dd1a2af2 (diff)
downloadmariadb-git-ef9a97e6856ec8128b66a47b124ce3c09f0fd1bc.tar.gz
WL#3337 (Event scheduler new architecture)
Third cut to simplify parsing phase. Now DROP EVENT works. Overloaded few functions to be able to use either sp_name or pass two LEX_STRINGs instead of a Event_timed pointer. This is transitional and eventually the old functions will be removed. For now DROP EVENT also works, does not need anymore a parsing object (Event_timed) and definer initialization because everyone who has EVENT_ACL can drop events, and this is checked on execution time in sql_parse.cc from the security context, as it should be. sql/event_data_objects.cc: overload few functions sql/event_scheduler.cc: Event_scheduler::drop_event() actually does not need Event_timed object but just an identifier, hence pass only sp_name. Overloaded Event_scheduler::find_event() to work with sp_name object. Eventually the old version will be removed. This is being done as transitional step to be able to test frequently code. sql/event_scheduler.h: Event_scheduler::drop_event() actually does not need Event_timed object but just an identifier, hence pass only sp_name. Overloaded Event_scheduler::find_event() to work with sp_name object. Eventually the old version will be removed. This is being done as transitional step to be able to test frequently code. sql/events.cc: Change db_drop_event() not to use Event_timed, either coming from parsing or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient because in Event_timed::drop a temporary object has to be created. Hence, dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs. sql/events.h: Change db_drop_event() not to use Event_timed, either coming from parsing or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient because in Event_timed::drop a temporary object has to be created. Hence, dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs. sql/events_priv.h: Change db_drop_event() not to use Event_timed, either coming from parsing or from Event_timed::drop, but use LEX_STRINGs. sp_name is not convinient because in Event_timed::drop a temporary object has to be created. Hence, dereference the sp_name in Events::drop_event() and pass the LEX_STRINGs. sql/sql_parse.cc: SQLCOM_DROP_EVENT does not need lex->event_parse_data object and is more like SQLCOM_SHOW_CREATE_EVENT. Therefore, move it to the block that handles the latter. sql/sql_yacc.yy: DROP EVENT does not need a parsing object, just a name. Store it as lex->spname. Pretty similar handling to the one of SHOW CREATE EVENT.
Diffstat (limited to 'sql/event_scheduler.h')
-rw-r--r--sql/event_scheduler.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/event_scheduler.h b/sql/event_scheduler.h
index 5ae310bab2a..183ef450be2 100644
--- a/sql/event_scheduler.h
+++ b/sql/event_scheduler.h
@@ -16,6 +16,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+class sp_name;
class Event_timed;
class THD;
@@ -73,7 +74,7 @@ public:
LEX_STRING *new_name);
bool
- drop_event(THD *thd, Event_timed *et);
+ drop_event(THD *thd, sp_name *name);
int
@@ -136,6 +137,9 @@ private:
Event_timed *
find_event(Event_timed *etn, bool remove_from_q);
+ Event_timed *
+ find_event(sp_name *name, bool remove_from_q);
+
uint
workers_count();