Commit 628be8a7 authored by unknown's avatar unknown
Browse files

WL#3337 (Event scheduler new architecture) 

event_scheduler_ng.cc/h is no more


BitKeeper/deleted/.del-event_scheduler_ng.cc~8896b89040dbc4f6:
  Delete: sql/event_scheduler_ng.cc
BitKeeper/deleted/.del-event_scheduler_ng.h~1431af5b185376f:
  Delete: sql/event_scheduler_ng.h
mysql-test/r/not_embedded_server.result:
  fix test
sql/Makefile.am:
  event_scheduler_ng.cc/h is no more
sql/event_queue.cc:
  event_scheduler_ng.cc/h is no more
sql/event_queue.h:
  event_scheduler_ng.cc/h is no more
sql/event_scheduler.cc:
  event_scheduler_ng.cc/h is no more
sql/event_scheduler.h:
  event_scheduler_ng.cc/h is no more
sql/events.cc:
  event_scheduler_ng.cc/h is no more
sql/events.h:
  event_scheduler_ng.cc/h is no more
parent 42a8e2c9

mysql-test/r/not_embedded_server.result

+0 −1
Original line number Diff line number Diff line 
prepare stmt1 from ' show full processlist ';

execute stmt1;

Id	User	Host	db	Command	Time	State	Info

number	event_scheduler	localhost	NULL	Connect	time	Suspended	NULL

number	root	localhost	test	Query	time	NULL	show full processlist

deallocate prepare stmt1;

sql/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ 
			sql_array.h sql_cursor.h events.h \

			sql_plugin.h authors.h sql_partition.h event_data_objects.h \

                        event_queue.h event_db_repository.h \

			partition_info.h partition_element.h event_scheduler_ng.h \

			partition_info.h partition_element.h event_scheduler.h \

			contributors.h

mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \

			item.cc item_sum.cc item_buff.cc item_func.cc \
@@ -105,7 +105,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ 
			tztime.cc my_time.c my_user.c my_decimal.cc\

			sp_head.cc sp_pcontext.cc  sp_rcontext.cc sp.cc \

			sp_cache.cc parse_file.cc sql_trigger.cc event_scheduler.cc\

                        event_scheduler_ng.cc events.cc event_data_objects.cc \

                        events.cc event_data_objects.cc \

                        event_queue.cc event_db_repository.cc \

			sql_plugin.cc sql_binlog.cc \

			sql_builtin.cc sql_tablespace.cc partition_info.cc

sql/event_queue.cc

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "event_queue.h"

#include "event_data_objects.h"

#include "event_db_repository.h"

#include "event_scheduler_ng.h"

#include "event_scheduler.h"





#define EVENT_QUEUE_INITIAL_SIZE 30
@@ -123,7 +123,7 @@ Event_queue::deinit_mutexes() 
*/



bool

Event_queue::init_queue(Event_db_repository *db_repo, Event_scheduler_ng *sched)

Event_queue::init_queue(Event_db_repository *db_repo, Event_scheduler *sched)

{

  int i= 0;

  bool ret= FALSE;

sql/event_queue.h

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class Event_job_data; 
class Event_queue_element;



class THD;

class Event_scheduler_ng;

class Event_scheduler;



class Event_queue

{
@@ -36,7 +36,7 @@ class Event_queue 
  deinit_mutexes();

  

  bool

  init_queue(Event_db_repository *db_repo, Event_scheduler_ng *sched);

  init_queue(Event_db_repository *db_repo, Event_scheduler *sched);

  

  void

  deinit_queue();
@@ -109,7 +109,7 @@ class Event_queue 
  void

  dbug_dump_queue(time_t now);



  Event_scheduler_ng *scheduler;

  Event_scheduler *scheduler;



  /* The sorted queue with the Event_job_data objects */

  QUEUE queue;

sql/event_scheduler.cc

+865 −0

File changed.

Preview size limit exceeded, changes collapsed.