database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

Browse Source 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
This commit is contained in:
cbell/Chuck@mysql_cab_desk.
2007-03-29 09:54:59 -04:00
parent f02726e72a 0627a31d7d
commit a591514a67
26 changed files with 1053 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
sql/event_data_objects.h
View File

@ -22,11 +22,9 @@
#define EVEX_BAD_PARAMS -5
#define EVEX_MICROSECOND_UNSUP -6
class sp_head;
class Sql_alloc;
class Event_queue_element_for_exec
{
public:
@ -54,6 +52,24 @@ protected:
MEM_ROOT mem_root;
public:
/*
ENABLED = feature can function normally (is turned on)
SLAVESIDE_DISABLED = feature is turned off on slave
DISABLED = feature is turned off
*/
enum enum_status
{
ENABLED = 1,
DISABLED,
SLAVESIDE_DISABLED
};
enum enum_on_completion
{
ON_COMPLETION_DROP = 1,
ON_COMPLETION_PRESERVE
};
LEX_STRING dbname;
LEX_STRING name;
LEX_STRING definer;// combination of user and host
@ -83,20 +99,9 @@ protected:
bool last_executed_changed;
public:
enum enum_status
{
ENABLED = 1,
DISABLED
};
enum enum_on_completion
{
ON_COMPLETION_DROP = 1,
ON_COMPLETION_PRESERVE
};
enum enum_on_completion on_completion;
enum enum_status status;
int on_completion;
int status;
longlong originator;
my_time_t last_executed;
my_time_t execute_at;
@ -216,19 +221,10 @@ private:
class Event_parse_data : public Sql_alloc
{
public:
enum enum_status
{
ENABLED = 1,
DISABLED
};
enum enum_on_completion
{
ON_COMPLETION_DROP = 1,
ON_COMPLETION_PRESERVE
};
enum enum_on_completion on_completion;
enum enum_status status;
int on_completion;
int status;
longlong originator;
/*
do_not_create will be set if STARTS time is in the past and
on_completion == ON_COMPLETION_DROP.
@ -298,6 +294,7 @@ private:
check_if_in_the_past(THD *thd, my_time_t ltime_utc);
Event_parse_data(const Event_parse_data &); /* Prevent use of these */
void Event_parse_data::check_originator_id(THD *thd);
void operator=(Event_parse_data &);
};