2005-12-08 00:17:05 +01:00
|
|
|
/* Copyright (C) 2004-2005 MySQL AB
|
2005-12-05 11:45:04 +01:00
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
|
|
#include "event_priv.h"
|
2005-12-12 21:19:19 +01:00
|
|
|
#include "event.h"
|
2005-12-02 13:22:15 +01:00
|
|
|
#include "sp.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
TODO list :
|
2005-12-06 16:15:29 +01:00
|
|
|
- The default value of created/modified should not be 0000-00-00 because of
|
|
|
|
STRICT mode restricions.
|
2005-12-05 11:45:04 +01:00
|
|
|
|
|
|
|
- CREATE EVENT should not go into binary log! Does it now? The SQL statements
|
|
|
|
issued by the EVENT are replicated.
|
2005-12-07 19:26:44 +01:00
|
|
|
I have an idea how to solve the problem at failover. So the status field
|
|
|
|
will be ENUM('DISABLED', 'ENABLED', 'SLAVESIDE_DISABLED').
|
|
|
|
In this case when CREATE EVENT is replicated it should go into the binary
|
|
|
|
as SLAVESIDE_DISABLED if it is ENABLED, when it's created as DISABLEd it
|
|
|
|
should be replicated as disabled. If an event is ALTERed as DISABLED the
|
|
|
|
query should go untouched into the binary log, when ALTERed as enable then
|
|
|
|
it should go as SLAVESIDE_DISABLED. This is regarding the SQL interface.
|
|
|
|
TT routines however modify mysql.event internally and this does not go the log
|
|
|
|
so in this case queries has to be injected into the log...somehow... or
|
|
|
|
maybe a solution is RBR for this case, because the event may go only from
|
|
|
|
ENABLED to DISABLED status change and this is safe for replicating. As well
|
|
|
|
an event may be deleted which is also safe for RBR.
|
2005-12-05 11:45:04 +01:00
|
|
|
|
|
|
|
- Maybe move all allocations during parsing to evex_mem_root thus saving
|
2005-12-02 13:22:15 +01:00
|
|
|
double parsing in evex_create_event!
|
2005-12-05 11:45:04 +01:00
|
|
|
|
2005-12-13 19:16:00 +01:00
|
|
|
- If the server is killed (stopping) try to kill executing events?
|
2005-12-05 11:45:04 +01:00
|
|
|
|
|
|
|
- What happens if one renames an event in the DB while it is in memory?
|
2005-12-07 22:29:00 +01:00
|
|
|
Or even deleting it?
|
|
|
|
|
2005-12-05 11:45:04 +01:00
|
|
|
- Consider using conditional variable when doing shutdown instead of
|
2005-12-13 19:16:00 +01:00
|
|
|
waiting till all worker threads end.
|
|
|
|
|
2005-12-05 11:45:04 +01:00
|
|
|
- Make event_timed::get_show_create_event() work
|
2005-12-12 21:19:19 +01:00
|
|
|
|
2005-12-05 11:45:04 +01:00
|
|
|
- Add logging to file
|
|
|
|
|
2005-12-12 21:19:19 +01:00
|
|
|
- Move comparison code to class event_timed
|
|
|
|
|
2005-12-05 11:45:04 +01:00
|
|
|
Warning:
|
|
|
|
- For now parallel execution is not possible because the same sp_head cannot be
|
|
|
|
executed few times!!! There is still no lock attached to particular event.
|
|
|
|
|
2005-12-07 22:29:00 +01:00
|
|
|
*/
|
2005-12-05 11:45:04 +01:00
|
|
|
|
|
|
|
|
2005-12-13 13:21:11 +01:00
|
|
|
QUEUE EVEX_EQ_NAME;
|
2005-12-05 11:45:04 +01:00
|
|
|
MEM_ROOT evex_mem_root;
|
2006-02-14 16:20:48 +01:00
|
|
|
time_t mysql_event_last_create_time= 0L;
|
|
|
|
|
|
|
|
|
|
|
|
static TABLE_FIELD_W_TYPE event_table_fields[EVEX_FIELD_COUNT] = {
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("db")},
|
|
|
|
{(char *) STRING_WITH_LEN("char(64)")},
|
|
|
|
{(char *) STRING_WITH_LEN("utf8")}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("name")},
|
|
|
|
{(char *) STRING_WITH_LEN("char(64)")},
|
|
|
|
{(char *) STRING_WITH_LEN("utf8")}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("body")},
|
|
|
|
{(char *) STRING_WITH_LEN("longblob")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("definer")},
|
|
|
|
{(char *) STRING_WITH_LEN("char(77)")},
|
|
|
|
{(char *) STRING_WITH_LEN("utf8")}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("execute_at")},
|
|
|
|
{(char *) STRING_WITH_LEN("datetime")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("interval_value")},
|
|
|
|
{(char *) STRING_WITH_LEN("int(11)")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("interval_field")},
|
|
|
|
{(char *) STRING_WITH_LEN("enum('YEAR','QUARTER','MONTH','DAY',"
|
|
|
|
"'HOUR','MINUTE','WEEK','SECOND','MICROSECOND','YEAR_MONTH','DAY_HOUR',"
|
|
|
|
"'DAY_MINUTE','DAY_SECOND','HOUR_MINUTE','HOUR_SECOND','MINUTE_SECOND',"
|
|
|
|
"'DAY_MICROSECOND','HOUR_MICROSECOND','MINUTE_MICROSECOND',"
|
|
|
|
"'SECOND_MICROSECOND')")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("created")},
|
|
|
|
{(char *) STRING_WITH_LEN("timestamp")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("modified")},
|
|
|
|
{(char *) STRING_WITH_LEN("timestamp")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("last_executed")},
|
|
|
|
{(char *) STRING_WITH_LEN("datetime")},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("starts")},
|
|
|
|
{(char *) STRING_WITH_LEN("datetime")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("ends")},
|
|
|
|
{(char *) STRING_WITH_LEN("datetime")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("status")},
|
|
|
|
{(char *) STRING_WITH_LEN("enum('ENABLED','DISABLED')")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("on_completion")},
|
|
|
|
{(char *) STRING_WITH_LEN("enum('DROP','PRESERVE')")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("sql_mode")},
|
|
|
|
{(char *) STRING_WITH_LEN("set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES',"
|
|
|
|
"'IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION',"
|
|
|
|
"'NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB',"
|
|
|
|
"'NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40',"
|
|
|
|
"'ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES',"
|
|
|
|
"'STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES',"
|
|
|
|
"'ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER',"
|
|
|
|
"'HIGH_NOT_PRECEDENCE')")},
|
|
|
|
{NULL, 0}
|
|
|
|
},
|
|
|
|
{
|
|
|
|
{(char *) STRING_WITH_LEN("comment")},
|
|
|
|
{(char *) STRING_WITH_LEN("char(64)")},
|
|
|
|
{(char *) STRING_WITH_LEN("utf8")}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
LEX_STRING interval_type_to_name[] = {
|
|
|
|
{(char *) STRING_WITH_LEN("YEAR")},
|
|
|
|
{(char *) STRING_WITH_LEN("QUARTER")},
|
|
|
|
{(char *) STRING_WITH_LEN("MONTH")},
|
|
|
|
{(char *) STRING_WITH_LEN("DAY")},
|
|
|
|
{(char *) STRING_WITH_LEN("HOUR")},
|
|
|
|
{(char *) STRING_WITH_LEN("MINUTE")},
|
|
|
|
{(char *) STRING_WITH_LEN("WEEK")},
|
|
|
|
{(char *) STRING_WITH_LEN("SECOND")},
|
|
|
|
{(char *) STRING_WITH_LEN("MICROSECOND")},
|
|
|
|
{(char *) STRING_WITH_LEN("YEAR_MONTH")},
|
|
|
|
{(char *) STRING_WITH_LEN("DAY_HOUR")},
|
|
|
|
{(char *) STRING_WITH_LEN("DAY_MINUTE")},
|
|
|
|
{(char *) STRING_WITH_LEN("DAY_SECOND")},
|
|
|
|
{(char *) STRING_WITH_LEN("HOUR_MINUTE")},
|
|
|
|
{(char *) STRING_WITH_LEN("HOUR_SECOND")},
|
|
|
|
{(char *) STRING_WITH_LEN("MINUTE_SECOND")},
|
|
|
|
{(char *) STRING_WITH_LEN("DAY_MICROSECOND")},
|
|
|
|
{(char *) STRING_WITH_LEN("HOUR_MICROSECOND")},
|
|
|
|
{(char *) STRING_WITH_LEN("MINUTE_MICROSECOND")},
|
|
|
|
{(char *) STRING_WITH_LEN("SECOND_MICROSECOND")}
|
|
|
|
};
|
2005-12-05 11:45:04 +01:00
|
|
|
|
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Inits the scheduler queue - prioritized queue from mysys/queue.c
|
|
|
|
|
|
|
|
Synopsis
|
|
|
|
evex_queue_init()
|
|
|
|
|
|
|
|
queue - pointer the the memory to be initialized as queue. has to be
|
|
|
|
allocated from the caller
|
|
|
|
|
|
|
|
Notes
|
|
|
|
During initialization the queue is sized for 30 events, and when is full
|
|
|
|
will auto extent with 30.
|
|
|
|
*/
|
|
|
|
|
2005-12-12 21:19:19 +01:00
|
|
|
void
|
|
|
|
evex_queue_init(EVEX_QUEUE_TYPE *queue)
|
|
|
|
{
|
2005-12-28 12:07:57 +02:00
|
|
|
if (init_queue_ex(queue, 30 /*num_el*/, 0 /*offset*/, 0 /*smallest_on_top*/,
|
|
|
|
event_timed_compare_q, NULL, 30 /*auto_extent*/))
|
2005-12-12 21:19:19 +01:00
|
|
|
sql_print_error("Insufficient memory to initialize executing queue.");
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
/*
|
|
|
|
Compares 2 LEX strings regarding case.
|
|
|
|
|
|
|
|
Synopsis
|
|
|
|
my_time_compare()
|
|
|
|
|
|
|
|
s - first LEX_STRING
|
|
|
|
t - second LEX_STRING
|
|
|
|
cs - charset
|
|
|
|
|
|
|
|
RETURNS:
|
|
|
|
-1 - s < t
|
|
|
|
0 - s == t
|
|
|
|
1 - s > t
|
|
|
|
|
|
|
|
Notes
|
|
|
|
TIME.second_part is not considered during comparison
|
|
|
|
*/
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
|
2005-12-08 20:37:54 +01:00
|
|
|
int sortcmp_lex_string(LEX_STRING s, LEX_STRING t, CHARSET_INFO *cs)
|
|
|
|
{
|
2005-12-28 12:07:57 +02:00
|
|
|
return cs->coll->strnncollsp(cs, (unsigned char *) s.str,s.length,
|
|
|
|
(unsigned char *) t.str,t.length, 0);
|
2005-12-08 20:37:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
/*
|
|
|
|
Compares 2 TIME structures
|
|
|
|
|
|
|
|
Synopsis
|
|
|
|
my_time_compare()
|
|
|
|
|
|
|
|
a - first TIME
|
|
|
|
b - second time
|
|
|
|
|
|
|
|
RETURNS:
|
|
|
|
-1 - a < b
|
|
|
|
0 - a == b
|
|
|
|
1 - a > b
|
|
|
|
|
|
|
|
Notes
|
|
|
|
TIME.second_part is not considered during comparison
|
|
|
|
*/
|
|
|
|
|
2005-12-12 21:19:19 +01:00
|
|
|
int
|
2005-12-02 13:22:15 +01:00
|
|
|
my_time_compare(TIME *a, TIME *b)
|
|
|
|
{
|
2006-01-18 20:41:22 +01:00
|
|
|
|
|
|
|
#ifdef ENABLE_WHEN_WE_HAVE_MILLISECOND_IN_TIMESTAMPS
|
2005-12-28 12:07:57 +02:00
|
|
|
my_ulonglong a_t= TIME_to_ulonglong_datetime(a)*100L + a->second_part;
|
|
|
|
my_ulonglong b_t= TIME_to_ulonglong_datetime(b)*100L + b->second_part;
|
2006-01-18 20:41:22 +01:00
|
|
|
#else
|
|
|
|
my_ulonglong a_t= TIME_to_ulonglong_datetime(a);
|
|
|
|
my_ulonglong b_t= TIME_to_ulonglong_datetime(b);
|
|
|
|
#endif
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-28 12:07:57 +02:00
|
|
|
if (a_t > b_t)
|
|
|
|
return 1;
|
|
|
|
else if (a_t < b_t)
|
|
|
|
return -1;
|
2005-12-13 13:21:11 +01:00
|
|
|
|
2005-12-28 12:07:57 +02:00
|
|
|
return 0;
|
2005-12-12 21:19:19 +01:00
|
|
|
}
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
/*
|
|
|
|
Compares the execute_at members of 2 event_timed instances
|
|
|
|
|
|
|
|
Synopsis
|
|
|
|
event_timed_compare()
|
|
|
|
|
|
|
|
a - first event_timed object
|
|
|
|
b - second event_timed object
|
|
|
|
|
|
|
|
RETURNS:
|
|
|
|
-1 - a->execute_at < b->execute_at
|
|
|
|
0 - a->execute_at == b->execute_at
|
|
|
|
1 - a->execute_at > b->execute_at
|
|
|
|
|
|
|
|
Notes
|
|
|
|
execute_at.second_part is not considered during comparison
|
|
|
|
*/
|
|
|
|
|
2006-01-10 11:31:45 +01:00
|
|
|
int
|
2005-12-28 12:07:57 +02:00
|
|
|
event_timed_compare(event_timed *a, event_timed *b)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-28 12:07:57 +02:00
|
|
|
return my_time_compare(&a->execute_at, &b->execute_at);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-01-10 11:31:45 +01:00
|
|
|
/*
|
2006-02-14 16:20:48 +01:00
|
|
|
Compares the execute_at members of 2 event_timed instances.
|
|
|
|
Used as callback for the prioritized queue when shifting
|
|
|
|
elements inside.
|
|
|
|
|
|
|
|
Synopsis
|
|
|
|
event_timed_compare()
|
|
|
|
|
|
|
|
vptr - not used (set it to NULL)
|
|
|
|
a - first event_timed object
|
|
|
|
b - second event_timed object
|
|
|
|
|
|
|
|
RETURNS:
|
|
|
|
-1 - a->execute_at < b->execute_at
|
|
|
|
0 - a->execute_at == b->execute_at
|
|
|
|
1 - a->execute_at > b->execute_at
|
|
|
|
|
|
|
|
Notes
|
|
|
|
execute_at.second_part is not considered during comparison
|
2006-01-10 11:31:45 +01:00
|
|
|
*/
|
|
|
|
|
2005-12-12 21:19:19 +01:00
|
|
|
int
|
|
|
|
event_timed_compare_q(void *vptr, byte* a, byte *b)
|
|
|
|
{
|
2005-12-28 12:07:57 +02:00
|
|
|
return event_timed_compare((event_timed *)a, (event_timed *)b);
|
2005-12-12 21:19:19 +01:00
|
|
|
}
|
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
/*
|
|
|
|
Reconstructs interval expression from interval type and expression
|
|
|
|
value that is in form of a value of the smalles entity:
|
|
|
|
For
|
|
|
|
YEAR_MONTH - expression is in months
|
|
|
|
DAY_MINUTE - expression is in minutes
|
|
|
|
|
|
|
|
Synopsis
|
|
|
|
event_reconstruct_interval_expression()
|
|
|
|
buf - preallocated String buffer to add the value to
|
|
|
|
interval - the interval type (for instance YEAR_MONTH)
|
|
|
|
expression - the value in the lowest entity
|
|
|
|
|
|
|
|
RETURNS
|
|
|
|
0 - OK
|
|
|
|
1 - Error
|
|
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
event_reconstruct_interval_expression(String *buf,
|
|
|
|
interval_type interval,
|
|
|
|
longlong expression)
|
|
|
|
{
|
|
|
|
ulonglong expr= expression;
|
|
|
|
char tmp_buff[128], *end;
|
|
|
|
bool close_quote= TRUE;
|
|
|
|
int multipl= 0;
|
|
|
|
char separator=':';
|
|
|
|
|
|
|
|
switch (interval) {
|
|
|
|
case INTERVAL_YEAR_MONTH:
|
|
|
|
multipl= 12;
|
|
|
|
separator= '-';
|
|
|
|
goto common_1_lev_code;
|
|
|
|
case INTERVAL_DAY_HOUR:
|
|
|
|
multipl= 24;
|
|
|
|
separator= ' ';
|
|
|
|
goto common_1_lev_code;
|
|
|
|
case INTERVAL_HOUR_MINUTE:
|
|
|
|
case INTERVAL_MINUTE_SECOND:
|
|
|
|
multipl= 60;
|
|
|
|
common_1_lev_code:
|
|
|
|
buf->append('\'');
|
|
|
|
end= longlong10_to_str(expression/multipl, tmp_buff, 10);
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));
|
|
|
|
expr= expr - (expr/multipl)*multipl;
|
|
|
|
break;
|
|
|
|
case INTERVAL_DAY_MINUTE:
|
|
|
|
{
|
|
|
|
int tmp_expr= expr;
|
|
|
|
|
|
|
|
tmp_expr/=(24*60);
|
|
|
|
buf->append('\'');
|
|
|
|
end= longlong10_to_str(tmp_expr, tmp_buff, 10);
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// days
|
|
|
|
buf->append(' ');
|
|
|
|
|
|
|
|
tmp_expr= expr - tmp_expr*(24*60);//minutes left
|
|
|
|
end= longlong10_to_str(tmp_expr/60, tmp_buff, 10);
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// hours
|
|
|
|
|
|
|
|
expr= tmp_expr - (tmp_expr/60)*60;
|
|
|
|
/* the code after the switch will finish */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case INTERVAL_HOUR_SECOND:
|
|
|
|
{
|
|
|
|
int tmp_expr= expr;
|
|
|
|
|
|
|
|
buf->append('\'');
|
|
|
|
end= longlong10_to_str(tmp_expr/3600, tmp_buff, 10);
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// hours
|
|
|
|
buf->append(':');
|
|
|
|
|
|
|
|
tmp_expr= tmp_expr - (tmp_expr/3600)*3600;
|
|
|
|
end= longlong10_to_str(tmp_expr/60, tmp_buff, 10);
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// minutes
|
|
|
|
|
|
|
|
expr= tmp_expr - (tmp_expr/60)*60;
|
|
|
|
/* the code after the switch will finish */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case INTERVAL_DAY_SECOND:
|
|
|
|
{
|
|
|
|
int tmp_expr= expr;
|
|
|
|
|
|
|
|
tmp_expr/=(24*3600);
|
|
|
|
buf->append('\'');
|
|
|
|
end= longlong10_to_str(tmp_expr, tmp_buff, 10);
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// days
|
|
|
|
buf->append(' ');
|
|
|
|
|
|
|
|
tmp_expr= expr - tmp_expr*(24*3600);//seconds left
|
|
|
|
end= longlong10_to_str(tmp_expr/3600, tmp_buff, 10);
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// hours
|
|
|
|
buf->append(':');
|
|
|
|
|
|
|
|
tmp_expr= tmp_expr - (tmp_expr/3600)*3600;
|
|
|
|
end= longlong10_to_str(tmp_expr/60, tmp_buff, 10);
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));// minutes
|
|
|
|
|
|
|
|
expr= tmp_expr - (tmp_expr/60)*60;
|
|
|
|
/* the code after the switch will finish */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case INTERVAL_DAY_MICROSECOND:
|
|
|
|
case INTERVAL_HOUR_MICROSECOND:
|
|
|
|
case INTERVAL_MINUTE_MICROSECOND:
|
|
|
|
case INTERVAL_SECOND_MICROSECOND:
|
2006-02-14 20:10:51 +01:00
|
|
|
my_error(ER_NOT_SUPPORTED_YET, MYF(0), "MICROSECOND");
|
2006-02-14 16:20:48 +01:00
|
|
|
return 1;
|
|
|
|
break;
|
|
|
|
case INTERVAL_QUARTER:
|
|
|
|
expr/= 3;
|
|
|
|
close_quote= FALSE;
|
|
|
|
break;
|
|
|
|
case INTERVAL_WEEK:
|
|
|
|
expr/= 7;
|
|
|
|
default:
|
|
|
|
close_quote= FALSE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (close_quote)
|
|
|
|
buf->append(separator);
|
|
|
|
end= longlong10_to_str(expr, tmp_buff, 10);
|
|
|
|
buf->append(tmp_buff, (uint) (end- tmp_buff));
|
|
|
|
if (close_quote)
|
|
|
|
buf->append('\'');
|
|
|
|
|
|
|
|
buf->append(' ');
|
|
|
|
LEX_STRING *ival= &interval_type_to_name[interval];
|
|
|
|
buf->append(ival->str, ival->length);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
/*
|
|
|
|
Open mysql.event table for read
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
evex_open_event_table_for_read()
|
|
|
|
thd Thread context
|
|
|
|
lock_type How to lock the table
|
2005-12-16 12:42:39 +01:00
|
|
|
table The table pointer
|
2006-02-14 16:20:48 +01:00
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
RETURN
|
2005-12-16 12:42:39 +01:00
|
|
|
1 Cannot lock table
|
|
|
|
2 The table is corrupted - different number of fields
|
|
|
|
0 OK
|
2005-12-06 16:15:29 +01:00
|
|
|
*/
|
|
|
|
|
2005-12-16 12:42:39 +01:00
|
|
|
int
|
|
|
|
evex_open_event_table(THD *thd, enum thr_lock_type lock_type, TABLE **table)
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
|
|
|
TABLE_LIST tables;
|
|
|
|
bool not_used;
|
|
|
|
DBUG_ENTER("open_proc_table");
|
|
|
|
|
|
|
|
bzero((char*) &tables, sizeof(tables));
|
|
|
|
tables.db= (char*) "mysql";
|
|
|
|
tables.table_name= tables.alias= (char*) "event";
|
|
|
|
tables.lock_type= lock_type;
|
|
|
|
|
|
|
|
if (simple_open_n_lock_tables(thd, &tables))
|
2005-12-16 12:42:39 +01:00
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
if (table_check_intact(tables.table, EVEX_FIELD_COUNT, event_table_fields,
|
|
|
|
&mysql_event_last_create_time,
|
|
|
|
ER_EVENT_CANNOT_LOAD_FROM_TABLE))
|
2005-12-16 12:42:39 +01:00
|
|
|
{
|
|
|
|
close_thread_tables(thd);
|
|
|
|
DBUG_RETURN(2);
|
|
|
|
}
|
|
|
|
*table= tables.table;
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2005-12-16 12:42:39 +01:00
|
|
|
DBUG_RETURN(0);
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Find row in open mysql.event table representing event
|
|
|
|
|
|
|
|
SYNOPSIS
|
2005-12-08 15:34:11 +01:00
|
|
|
evex_db_find_event_aux()
|
2005-12-06 16:15:29 +01:00
|
|
|
thd Thread context
|
|
|
|
dbname Name of event's database
|
|
|
|
rname Name of the event inside the db
|
|
|
|
table TABLE object for open mysql.event table.
|
|
|
|
|
|
|
|
RETURN VALUE
|
2005-12-08 15:34:11 +01:00
|
|
|
0 - Routine found
|
|
|
|
EVEX_KEY_NOT_FOUND - No routine with given name
|
2005-12-06 16:15:29 +01:00
|
|
|
*/
|
|
|
|
|
2005-12-06 16:46:29 +01:00
|
|
|
int
|
2005-12-08 15:34:11 +01:00
|
|
|
evex_db_find_event_aux(THD *thd, const LEX_STRING dbname,
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
const LEX_STRING ev_name,
|
|
|
|
const LEX_STRING user_name,
|
|
|
|
TABLE *table)
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
2005-12-08 15:34:11 +01:00
|
|
|
byte key[MAX_KEY_LENGTH];
|
|
|
|
DBUG_ENTER("evex_db_find_event_aux");
|
2005-12-07 22:29:00 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %.*s", ev_name.length, ev_name.str));
|
2005-12-06 16:15:29 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
Create key to find row. We have to use field->store() to be able to
|
|
|
|
handle VARCHAR and CHAR fields.
|
|
|
|
Assumption here is that the two first fields in the table are
|
|
|
|
'db' and 'name' and the first key is the primary key over the
|
|
|
|
same fields.
|
|
|
|
*/
|
2005-12-08 15:34:11 +01:00
|
|
|
if (dbname.length > table->field[EVEX_FIELD_DB]->field_length ||
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
ev_name.length > table->field[EVEX_FIELD_NAME]->field_length ||
|
|
|
|
user_name.length > table->field[EVEX_FIELD_DEFINER]->field_length)
|
|
|
|
|
2005-12-07 22:29:00 +01:00
|
|
|
DBUG_RETURN(EVEX_KEY_NOT_FOUND);
|
2005-12-07 19:26:44 +01:00
|
|
|
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
table->field[EVEX_FIELD_DB]->store(dbname.str, dbname.length, &my_charset_bin);
|
|
|
|
table->field[EVEX_FIELD_NAME]->store(ev_name.str, ev_name.length,
|
|
|
|
&my_charset_bin);
|
|
|
|
table->field[EVEX_FIELD_DEFINER]->store(user_name.str, user_name.length,
|
|
|
|
&my_charset_bin);
|
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
key_copy(key, table->record[0], table->key_info, table->key_info->key_length);
|
|
|
|
|
2005-12-07 19:26:44 +01:00
|
|
|
if (table->file->index_read_idx(table->record[0], 0, key,
|
2005-12-07 22:29:00 +01:00
|
|
|
table->key_info->key_length,HA_READ_KEY_EXACT))
|
|
|
|
DBUG_RETURN(EVEX_KEY_NOT_FOUND);
|
2005-12-06 16:15:29 +01:00
|
|
|
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
/*
|
|
|
|
Puts some data common to CREATE and ALTER EVENT into a row.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
evex_fill_row()
|
|
|
|
thd THD
|
|
|
|
table the row to fill out
|
|
|
|
et Event's data
|
|
|
|
|
2005-12-28 18:29:32 +02:00
|
|
|
Returns
|
|
|
|
0 - ok
|
|
|
|
EVEX_GENERAL_ERROR - bad data
|
|
|
|
EVEX_GET_FIELD_FAILED - field count does not match. table corrupted?
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
DESCRIPTION
|
|
|
|
Used both when an event is created and when it is altered.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
2005-12-06 16:15:29 +01:00
|
|
|
evex_fill_row(THD *thd, TABLE *table, event_timed *et, my_bool is_update)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-28 18:29:32 +02:00
|
|
|
enum evex_table_field field_num;
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_ENTER("evex_fill_row");
|
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
DBUG_PRINT("info", ("dbname=[%s]", et->dbname.str));
|
|
|
|
DBUG_PRINT("info", ("name =[%s]", et->name.str));
|
|
|
|
DBUG_PRINT("info", ("body =[%s]", et->body.str));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-28 18:29:32 +02:00
|
|
|
if (table->field[field_num= EVEX_FIELD_DB]->
|
|
|
|
store(et->dbname.str, et->dbname.length, system_charset_info))
|
|
|
|
goto trunc_err;
|
|
|
|
|
|
|
|
if (table->field[field_num= EVEX_FIELD_NAME]->
|
|
|
|
store(et->name.str, et->name.length, system_charset_info))
|
|
|
|
goto trunc_err;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-01-10 11:31:45 +01:00
|
|
|
// both ON_COMPLETION and STATUS are NOT NULL thus not calling set_notnull()
|
2005-12-08 00:17:05 +01:00
|
|
|
table->field[EVEX_FIELD_ON_COMPLETION]->store((longlong)et->on_completion);
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
table->field[EVEX_FIELD_STATUS]->store((longlong)et->status);
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (et->body.str)
|
2005-12-28 18:29:32 +02:00
|
|
|
if (table->field[field_num= EVEX_FIELD_BODY]->
|
|
|
|
store(et->body.str, et->body.length, system_charset_info))
|
|
|
|
goto trunc_err;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (et->starts.year)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
table->field[EVEX_FIELD_STARTS]->set_notnull();// set NULL flag to OFF
|
2006-01-10 11:31:45 +01:00
|
|
|
table->field[EVEX_FIELD_STARTS]->
|
|
|
|
store_time(&et->starts, MYSQL_TIMESTAMP_DATETIME);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (et->ends.year)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
table->field[EVEX_FIELD_ENDS]->set_notnull();
|
2006-01-10 11:31:45 +01:00
|
|
|
table->field[EVEX_FIELD_ENDS]->
|
|
|
|
store_time(&et->ends, MYSQL_TIMESTAMP_DATETIME);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (et->expression)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
table->field[EVEX_FIELD_INTERVAL_EXPR]->set_notnull();
|
2005-12-08 00:17:05 +01:00
|
|
|
table->field[EVEX_FIELD_INTERVAL_EXPR]->store((longlong)et->expression);
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
table->field[EVEX_FIELD_TRANSIENT_INTERVAL]->set_notnull();
|
2005-12-05 11:45:04 +01:00
|
|
|
/*
|
2006-01-10 11:31:45 +01:00
|
|
|
In the enum (C) intervals start from 0 but in mysql enum valid values start
|
|
|
|
from 1. Thus +1 offset is needed!
|
2005-12-05 11:45:04 +01:00
|
|
|
*/
|
2006-01-10 11:31:45 +01:00
|
|
|
table->field[EVEX_FIELD_TRANSIENT_INTERVAL]->store((longlong)et->interval+1);
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
|
|
|
|
table->field[EVEX_FIELD_EXECUTE_AT]->set_null();
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-08 00:17:05 +01:00
|
|
|
else if (et->execute_at.year)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
// fix_fields already called in init_execute_at
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
table->field[EVEX_FIELD_INTERVAL_EXPR]->set_null();
|
|
|
|
table->field[EVEX_FIELD_TRANSIENT_INTERVAL]->set_null();
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
table->field[EVEX_FIELD_EXECUTE_AT]->set_notnull();
|
2005-12-08 00:17:05 +01:00
|
|
|
table->field[EVEX_FIELD_EXECUTE_AT]->store_time(&et->execute_at,
|
2005-12-06 16:15:29 +01:00
|
|
|
MYSQL_TIMESTAMP_DATETIME);
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-01-10 11:31:45 +01:00
|
|
|
table->field[EVEX_FIELD_TRANSIENT_INTERVAL]->set_null();
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2005-12-06 16:15:29 +01:00
|
|
|
DBUG_ASSERT(is_update);
|
2005-12-02 13:22:15 +01:00
|
|
|
// it is normal to be here when the action is update
|
|
|
|
// this is an error if the action is create. something is borked
|
|
|
|
}
|
|
|
|
|
|
|
|
((Field_timestamp *)table->field[EVEX_FIELD_MODIFIED])->set_time();
|
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (et->comment.length)
|
2005-12-28 18:29:32 +02:00
|
|
|
if (table->field[field_num= EVEX_FIELD_COMMENT]->
|
|
|
|
store(et->comment.str, et->comment.length, system_charset_info))
|
|
|
|
goto trunc_err;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-28 18:29:32 +02:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
trunc_err:
|
|
|
|
my_error(ER_EVENT_DATA_TOO_LONG, MYF(0));
|
|
|
|
DBUG_RETURN(EVEX_GENERAL_ERROR);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Creates an event in mysql.event
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
db_create_event()
|
2005-12-28 12:07:57 +02:00
|
|
|
thd THD
|
|
|
|
et event_timed object containing information for the event
|
|
|
|
create_if_not - if an warning should be generated in case event exists
|
|
|
|
rows_affected - how many rows were affected
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-08 15:34:11 +01:00
|
|
|
Return value
|
|
|
|
0 - OK
|
|
|
|
EVEX_GENERAL_ERROR - Failure
|
2005-12-02 13:22:15 +01:00
|
|
|
DESCRIPTION
|
|
|
|
Creates an event. Relies on evex_fill_row which is shared with
|
|
|
|
db_update_event. The name of the event is inside "et".
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
2005-12-28 12:07:57 +02:00
|
|
|
db_create_event(THD *thd, event_timed *et, my_bool create_if_not,
|
|
|
|
uint *rows_affected)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-28 12:07:57 +02:00
|
|
|
int ret= 0;
|
2005-12-02 13:22:15 +01:00
|
|
|
TABLE *table;
|
|
|
|
char definer[HOSTNAME_LENGTH+USERNAME_LENGTH+2];
|
|
|
|
char olddb[128];
|
2005-12-06 16:15:29 +01:00
|
|
|
bool dbchanged= false;
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_ENTER("db_create_event");
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %.*s", et->name.length, et->name.str));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-28 12:07:57 +02:00
|
|
|
*rows_affected= 0;
|
2005-12-06 16:15:29 +01:00
|
|
|
DBUG_PRINT("info", ("open mysql.event for update"));
|
2005-12-16 12:42:39 +01:00
|
|
|
if (evex_open_event_table(thd, TL_WRITE, &table))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-06 16:15:29 +01:00
|
|
|
my_error(ER_EVENT_OPEN_TABLE_FAILED, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
DBUG_PRINT("info", ("check existance of an event with the same name"));
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
if (!evex_db_find_event_aux(thd, et->dbname, et->name, et->definer, table))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-01-18 20:41:22 +01:00
|
|
|
if (create_if_not)
|
|
|
|
{
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
|
|
|
ER_EVENT_ALREADY_EXISTS, ER(ER_EVENT_ALREADY_EXISTS),
|
|
|
|
et->name.str);
|
|
|
|
goto ok;
|
|
|
|
}
|
|
|
|
my_error(ER_EVENT_ALREADY_EXISTS, MYF(0), et->name.str);
|
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
DBUG_PRINT("info", ("non-existant, go forward"));
|
2005-12-08 00:17:05 +01:00
|
|
|
if ((ret= sp_use_new_db(thd, et->dbname.str,olddb, sizeof(olddb),0, &dbchanged)))
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
|
|
|
my_error(ER_BAD_DB_ERROR, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
restore_record(table, s->default_values); // Get default values for fields
|
|
|
|
|
2005-12-28 18:29:32 +02:00
|
|
|
if (system_charset_info->cset->numchars(system_charset_info, et->dbname.str,
|
|
|
|
et->dbname.str + et->dbname.length)
|
|
|
|
> EVEX_DB_FIELD_LEN)
|
|
|
|
{
|
|
|
|
my_error(ER_TOO_LONG_IDENT, MYF(0), et->dbname.str);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (system_charset_info->cset->numchars(system_charset_info, et->name.str,
|
|
|
|
et->name.str + et->name.length)
|
|
|
|
> EVEX_DB_FIELD_LEN)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
my_error(ER_TOO_LONG_IDENT, MYF(0), et->name.str);
|
2005-12-07 22:29:00 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-28 18:29:32 +02:00
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (et->body.length > table->field[EVEX_FIELD_BODY]->field_length)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
my_error(ER_TOO_LONG_BODY, MYF(0), et->name.str);
|
2005-12-07 22:29:00 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-07 22:29:00 +01:00
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (!(et->expression) && !(et->execute_at.year))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("error", ("neither expression nor execute_at are set!"));
|
2005-12-08 15:34:11 +01:00
|
|
|
my_error(ER_EVENT_NEITHER_M_EXPR_NOR_M_AT, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-06 16:15:29 +01:00
|
|
|
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
if ((ret=table->field[EVEX_FIELD_DEFINER]->store(et->definer.str,
|
|
|
|
et->definer.length,
|
|
|
|
system_charset_info)))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 15:34:11 +01:00
|
|
|
my_error(ER_EVENT_STORE_FAILED, MYF(0), et->name.str, ret);
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
((Field_timestamp *)table->field[EVEX_FIELD_CREATED])->set_time();
|
2005-12-08 15:34:11 +01:00
|
|
|
|
|
|
|
// evex_fill_row() calls my_error() in case of error so no need to handle it here
|
2005-12-06 16:15:29 +01:00
|
|
|
if ((ret= evex_fill_row(thd, table, et, false)))
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-01-11 12:49:56 +01:00
|
|
|
if (table->file->ha_write_row(table->record[0]))
|
2005-12-07 19:26:44 +01:00
|
|
|
{
|
2005-12-08 15:34:11 +01:00
|
|
|
my_error(ER_EVENT_STORE_FAILED, MYF(0), et->name.str, ret);
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
|
|
|
}
|
2005-12-07 22:29:00 +01:00
|
|
|
|
|
|
|
if (mysql_bin_log.is_open())
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
thd->clear_error();
|
|
|
|
/* Such a statement can always go directly to binlog, no trans cache */
|
2006-01-11 12:49:56 +01:00
|
|
|
thd->binlog_query(THD::MYSQL_QUERY_TYPE,
|
|
|
|
thd->query, thd->query_length, FALSE, FALSE);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-28 12:07:57 +02:00
|
|
|
|
|
|
|
*rows_affected= 1;
|
|
|
|
ok:
|
2005-12-07 19:26:44 +01:00
|
|
|
if (dbchanged)
|
|
|
|
(void) mysql_change_db(thd, olddb, 1);
|
2005-12-13 13:21:11 +01:00
|
|
|
if (table)
|
|
|
|
close_thread_tables(thd);
|
2005-12-07 19:26:44 +01:00
|
|
|
DBUG_RETURN(EVEX_OK);
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2005-12-07 19:26:44 +01:00
|
|
|
err:
|
2005-12-02 13:22:15 +01:00
|
|
|
if (dbchanged)
|
2005-12-06 16:15:29 +01:00
|
|
|
(void) mysql_change_db(thd, olddb, 1);
|
2005-12-13 13:21:11 +01:00
|
|
|
if (table)
|
|
|
|
close_thread_tables(thd);
|
2005-12-07 19:26:44 +01:00
|
|
|
DBUG_RETURN(EVEX_GENERAL_ERROR);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
2005-12-08 15:34:11 +01:00
|
|
|
Used to execute ALTER EVENT. Pendant to evex_update_event().
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
db_update_event()
|
|
|
|
thd THD
|
|
|
|
sp_name the name of the event to alter
|
|
|
|
et event's data
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
sp_name is passed since this is the name of the event to
|
|
|
|
alter in case of RENAME TO.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int
|
2005-12-08 15:34:11 +01:00
|
|
|
db_update_event(THD *thd, event_timed *et, sp_name *new_name)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
TABLE *table;
|
2005-12-07 22:29:00 +01:00
|
|
|
int ret= EVEX_OPEN_TABLE_FAILED;
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_ENTER("db_update_event");
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
DBUG_PRINT("enter", ("dbname: %.*s", et->dbname.length, et->dbname.str));
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %.*s", et->name.length, et->name.str));
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
DBUG_PRINT("enter", ("user: %.*s", et->name.length, et->name.str));
|
2005-12-08 00:17:05 +01:00
|
|
|
if (new_name)
|
|
|
|
DBUG_PRINT("enter", ("rename to: %.*s", new_name->m_name.length,
|
|
|
|
new_name->m_name.str));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-16 12:42:39 +01:00
|
|
|
if (evex_open_event_table(thd, TL_WRITE, &table))
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
|
|
|
my_error(ER_EVENT_OPEN_TABLE_FAILED, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
2005-12-08 15:34:11 +01:00
|
|
|
|
|
|
|
// first look whether we overwrite
|
2005-12-08 20:37:54 +01:00
|
|
|
if (new_name)
|
2005-12-08 15:34:11 +01:00
|
|
|
{
|
2005-12-08 20:37:54 +01:00
|
|
|
if (!sortcmp_lex_string(et->name, new_name->m_name, system_charset_info) &&
|
|
|
|
!sortcmp_lex_string(et->dbname, new_name->m_db, system_charset_info))
|
|
|
|
{
|
|
|
|
my_error(ER_EVENT_SAME_NAME, MYF(0), et->name.str);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
if (!evex_db_find_event_aux(thd, new_name->m_db, new_name->m_name,
|
|
|
|
et->definer, table))
|
2005-12-08 20:37:54 +01:00
|
|
|
{
|
|
|
|
my_error(ER_EVENT_ALREADY_EXISTS, MYF(0), new_name->m_name.str);
|
|
|
|
goto err;
|
|
|
|
}
|
2005-12-08 15:34:11 +01:00
|
|
|
}
|
|
|
|
/*
|
|
|
|
...and then whether there is such an event. don't exchange the blocks
|
|
|
|
because you will get error 120 from table handler because new_name will
|
|
|
|
overwrite the key and SE will tell us that it cannot find the already found
|
|
|
|
row (copied into record[1] later
|
|
|
|
*/
|
|
|
|
if (EVEX_KEY_NOT_FOUND == evex_db_find_event_aux(thd, et->dbname, et->name,
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
et->definer, table))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
my_error(ER_EVENT_DOES_NOT_EXIST, MYF(0), et->name.str);
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
2005-12-08 15:34:11 +01:00
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
|
|
|
|
store_record(table,record[1]);
|
|
|
|
|
2005-12-07 19:26:44 +01:00
|
|
|
// Don't update create on row update.
|
|
|
|
table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
|
|
|
|
|
|
|
|
// evex_fill_row() calls my_error() in case of error so no need to handle it here
|
2005-12-06 16:15:29 +01:00
|
|
|
if ((ret= evex_fill_row(thd, table, et, true)))
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2005-12-08 00:17:05 +01:00
|
|
|
if (new_name)
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
|
|
|
table->field[EVEX_FIELD_DB]->
|
2005-12-08 00:17:05 +01:00
|
|
|
store(new_name->m_db.str, new_name->m_db.length, system_charset_info);
|
2005-12-06 16:15:29 +01:00
|
|
|
table->field[EVEX_FIELD_NAME]->
|
2005-12-08 00:17:05 +01:00
|
|
|
store(new_name->m_name.str, new_name->m_name.length, system_charset_info);
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-01-11 12:49:56 +01:00
|
|
|
if ((ret= table->file->ha_update_row(table->record[1], table->record[0])))
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
2005-12-08 15:34:11 +01:00
|
|
|
my_error(ER_EVENT_STORE_FAILED, MYF(0), et->name.str, ret);
|
2005-12-07 19:26:44 +01:00
|
|
|
goto err;
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-07 19:26:44 +01:00
|
|
|
|
|
|
|
// close mysql.event or we crash later when loading the event from disk
|
2005-12-02 13:22:15 +01:00
|
|
|
close_thread_tables(thd);
|
2005-12-07 19:26:44 +01:00
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
err:
|
|
|
|
if (table)
|
|
|
|
close_thread_tables(thd);
|
|
|
|
DBUG_RETURN(EVEX_GENERAL_ERROR);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
2005-12-06 16:15:29 +01:00
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
/*
|
2005-12-07 22:29:00 +01:00
|
|
|
Looks for a named event in mysql.event and in case of success returns
|
|
|
|
an object will data loaded from the table.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
db_find_event()
|
|
|
|
thd THD
|
|
|
|
name the name of the event to find
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
definer who owns the event
|
2005-12-07 22:29:00 +01:00
|
|
|
ett event's data if event is found
|
|
|
|
tbl TABLE object to use when not NULL
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
1) Use sp_name for look up, return in **ett if found
|
|
|
|
2) tbl is not closed at exit
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
2005-12-07 22:29:00 +01:00
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
static int
|
2006-02-14 16:20:48 +01:00
|
|
|
db_find_event(THD *thd, sp_name *name, LEX_STRING *definer, event_timed **ett,
|
|
|
|
TABLE *tbl, MEM_ROOT *root)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
TABLE *table;
|
|
|
|
int ret;
|
|
|
|
char *ptr;
|
2006-02-14 16:20:48 +01:00
|
|
|
event_timed *et=NULL;
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_ENTER("db_find_event");
|
2005-12-07 19:26:44 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %*s", name->m_name.length, name->m_name.str));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
if (!root)
|
|
|
|
root= &evex_mem_root;
|
|
|
|
|
2005-12-07 19:26:44 +01:00
|
|
|
if (tbl)
|
|
|
|
table= tbl;
|
2005-12-16 12:42:39 +01:00
|
|
|
else if (evex_open_event_table(thd, TL_READ, &table))
|
2005-12-06 16:15:29 +01:00
|
|
|
{
|
|
|
|
my_error(ER_EVENT_OPEN_TABLE_FAILED, MYF(0));
|
2005-12-07 19:26:44 +01:00
|
|
|
ret= EVEX_GENERAL_ERROR;
|
2005-12-06 16:15:29 +01:00
|
|
|
goto done;
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
if ((ret= evex_db_find_event_aux(thd, name->m_db, name->m_name, *definer,
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
table)))
|
2005-12-07 19:26:44 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
my_error(ER_EVENT_DOES_NOT_EXIST, MYF(0), name->m_name.str);
|
2005-12-07 19:26:44 +01:00
|
|
|
goto done;
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
et= new event_timed;
|
|
|
|
|
|
|
|
/*
|
2005-12-07 19:26:44 +01:00
|
|
|
1)The table should not be closed beforehand. ::load_from_row() only loads
|
|
|
|
and does not compile
|
|
|
|
|
|
|
|
2)::load_from_row() is silent on error therefore we emit error msg here
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
2006-02-14 16:20:48 +01:00
|
|
|
if ((ret= et->load_from_row(root, table)))
|
2005-12-07 19:26:44 +01:00
|
|
|
{
|
|
|
|
my_error(ER_EVENT_CANNOT_LOAD_FROM_TABLE, MYF(0));
|
2005-12-02 13:22:15 +01:00
|
|
|
goto done;
|
2005-12-07 19:26:44 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
done:
|
|
|
|
if (ret && et)
|
|
|
|
{
|
|
|
|
delete et;
|
|
|
|
et= 0;
|
|
|
|
}
|
2005-12-07 19:26:44 +01:00
|
|
|
// don't close the table if we haven't opened it ourselves
|
2005-12-13 23:10:29 +01:00
|
|
|
if (!tbl && table)
|
2005-12-07 19:26:44 +01:00
|
|
|
close_thread_tables(thd);
|
2005-12-02 13:22:15 +01:00
|
|
|
*ett= et;
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-12-07 22:29:00 +01:00
|
|
|
/*
|
|
|
|
Looks for a named event in mysql.event and then loads it from
|
|
|
|
the table, compiles it and insert it into the cache.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
evex_load_and_compile_event()
|
|
|
|
thd THD
|
|
|
|
spn the name of the event to alter
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
definer who is the owner
|
2005-12-07 22:29:00 +01:00
|
|
|
use_lock whether to obtain a lock on LOCK_event_arrays or not
|
|
|
|
|
|
|
|
RETURN VALUE
|
|
|
|
0 - OK
|
|
|
|
< 0 - error (in this case underlying functions call my_error()).
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
static int
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
evex_load_and_compile_event(THD * thd, sp_name *spn, LEX_STRING definer,
|
|
|
|
bool use_lock)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
int ret= 0;
|
|
|
|
MEM_ROOT *tmp_mem_root;
|
2005-12-13 19:16:00 +01:00
|
|
|
event_timed *ett;
|
2005-12-15 14:12:28 +01:00
|
|
|
Open_tables_state backup;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
DBUG_ENTER("db_load_and_compile_event");
|
|
|
|
DBUG_PRINT("enter", ("name: %*s", spn->m_name.length, spn->m_name.str));
|
|
|
|
|
|
|
|
tmp_mem_root= thd->mem_root;
|
|
|
|
thd->mem_root= &evex_mem_root;
|
|
|
|
|
2005-12-15 14:12:28 +01:00
|
|
|
thd->reset_n_backup_open_tables_state(&backup);
|
2005-12-07 19:26:44 +01:00
|
|
|
// no need to use my_error() here because db_find_event() has done it
|
2006-02-14 16:20:48 +01:00
|
|
|
ret= db_find_event(thd, spn, &definer, &ett, NULL, NULL);
|
|
|
|
thd->restore_backup_open_tables_state(&backup);
|
|
|
|
if (ret)
|
2005-12-02 13:22:15 +01:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
/*
|
2005-12-07 19:26:44 +01:00
|
|
|
allocate on evex_mem_root. if you call without evex_mem_root
|
2005-12-08 00:17:05 +01:00
|
|
|
then sphead will not be cleared!
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
|
|
|
if ((ret= ett->compile(thd, &evex_mem_root)))
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
ett->compute_next_execution_time();
|
|
|
|
if (use_lock)
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_event_arrays));
|
|
|
|
|
2005-12-13 19:16:00 +01:00
|
|
|
evex_queue_insert(&EVEX_EQ_NAME, (EVEX_PTOQEL) ett);
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
/*
|
2005-12-08 00:17:05 +01:00
|
|
|
There is a copy in the array which we don't need. sphead won't be
|
2005-12-02 13:22:15 +01:00
|
|
|
destroyed.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (use_lock)
|
|
|
|
VOID(pthread_mutex_unlock(&LOCK_event_arrays));
|
|
|
|
|
|
|
|
done:
|
|
|
|
if (thd->mem_root != tmp_mem_root)
|
|
|
|
thd->mem_root= tmp_mem_root;
|
|
|
|
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-07 19:28:33 +01:00
|
|
|
/*
|
2006-02-14 16:20:48 +01:00
|
|
|
Removes from queue in memory the event which is identified by the tupple
|
|
|
|
(db, name).
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
evex_remove_from_cache()
|
|
|
|
|
|
|
|
db - db name
|
|
|
|
name - event name
|
|
|
|
use_lock - whether to lock the mutex LOCK_event_arrays or not in case it
|
|
|
|
has been already locked outside
|
|
|
|
is_drop - if an event is currently being executed then we can also delete
|
|
|
|
the event_timed instance, so we alarm the event that it should
|
|
|
|
drop itself if this parameter is set to TRUE. It's false on
|
|
|
|
ALTER EVENT.
|
|
|
|
|
|
|
|
RETURNS
|
|
|
|
0 - OK (always)
|
2006-02-07 19:28:33 +01:00
|
|
|
*/
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
static int
|
2006-01-20 22:24:58 +01:00
|
|
|
evex_remove_from_cache(LEX_STRING *db, LEX_STRING *name, bool use_lock,
|
|
|
|
bool is_drop)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-02-14 16:20:48 +01:00
|
|
|
//ToDo : Add definer to the tuple (db, name) to become triple
|
2005-12-02 13:22:15 +01:00
|
|
|
uint i;
|
|
|
|
|
|
|
|
DBUG_ENTER("evex_remove_from_cache");
|
|
|
|
/*
|
|
|
|
It is possible that 2 (or 1) pass(es) won't find the event in memory.
|
|
|
|
The reason is that DISABLED events are not cached.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (use_lock)
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_event_arrays));
|
2005-12-13 13:21:11 +01:00
|
|
|
|
2005-12-12 21:19:19 +01:00
|
|
|
for (i= 0; i < evex_queue_num_elements(EVEX_EQ_NAME); ++i)
|
|
|
|
{
|
2005-12-13 13:21:11 +01:00
|
|
|
event_timed *et= evex_queue_element(&EVEX_EQ_NAME, i, event_timed*);
|
2005-12-12 21:19:19 +01:00
|
|
|
DBUG_PRINT("info", ("[%s.%s]==[%s.%s]?",db->str,name->str, et->dbname.str,
|
|
|
|
et->name.str));
|
|
|
|
if (!sortcmp_lex_string(*name, et->name, system_charset_info) &&
|
|
|
|
!sortcmp_lex_string(*db, et->dbname, system_charset_info))
|
|
|
|
{
|
2006-01-10 11:31:45 +01:00
|
|
|
if (!et->is_running())
|
|
|
|
{
|
2006-01-20 22:24:58 +01:00
|
|
|
DBUG_PRINT("evex_remove_from_cache", ("not running - free and delete"));
|
2006-01-10 11:31:45 +01:00
|
|
|
et->free_sp();
|
|
|
|
delete et;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-01-20 22:24:58 +01:00
|
|
|
DBUG_PRINT("evex_remove_from_cache",
|
|
|
|
("running.defer mem free. is_drop=%d", is_drop));
|
2006-01-10 11:31:45 +01:00
|
|
|
et->flags|= EVENT_EXEC_NO_MORE;
|
2006-01-20 22:24:58 +01:00
|
|
|
et->dropped= is_drop;
|
2006-01-10 11:31:45 +01:00
|
|
|
}
|
2006-01-20 22:24:58 +01:00
|
|
|
DBUG_PRINT("evex_remove_from_cache", ("delete from queue"));
|
2005-12-12 21:19:19 +01:00
|
|
|
evex_queue_delete_element(&EVEX_EQ_NAME, i);
|
|
|
|
// ok, we have cleaned
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
done:
|
|
|
|
if (use_lock)
|
|
|
|
VOID(pthread_mutex_unlock(&LOCK_event_arrays));
|
|
|
|
|
2005-12-07 19:26:44 +01:00
|
|
|
DBUG_RETURN(0);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
The function exported to the world for creating of events.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
evex_create_event()
|
|
|
|
thd THD
|
|
|
|
et event's data
|
|
|
|
create_options Options specified when in the query. We are
|
|
|
|
interested whether there is IF NOT EXISTS
|
2005-12-28 12:07:57 +02:00
|
|
|
rows_affected How many rows were affected
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
NOTES
|
|
|
|
- in case there is an event with the same name (db) and
|
|
|
|
IF NOT EXISTS is specified, an warning is put into the W stack.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2005-12-28 12:07:57 +02:00
|
|
|
evex_create_event(THD *thd, event_timed *et, uint create_options,
|
|
|
|
uint *rows_affected)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
DBUG_ENTER("evex_create_event");
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %*s options:%d", et->name.length,
|
|
|
|
et->name.str, create_options));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-28 12:07:57 +02:00
|
|
|
if ((ret = db_create_event(thd, et,
|
|
|
|
create_options & HA_LEX_CREATE_IF_NOT_EXISTS,
|
|
|
|
rows_affected)))
|
2005-12-02 13:22:15 +01:00
|
|
|
goto done;
|
|
|
|
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_evex_running));
|
2005-12-08 00:17:05 +01:00
|
|
|
if (evex_is_running && et->status == MYSQL_EVENT_ENABLED)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 00:17:05 +01:00
|
|
|
sp_name spn(et->dbname, et->name);
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
ret= evex_load_and_compile_event(thd, &spn, et->definer, true);
|
2005-12-02 13:22:15 +01:00
|
|
|
}
|
2005-12-06 16:15:29 +01:00
|
|
|
VOID(pthread_mutex_unlock(&LOCK_evex_running));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
done:
|
2005-12-06 16:15:29 +01:00
|
|
|
// No need to close the table, it will be closed in sql_parse::do_command
|
|
|
|
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_RETURN(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
The function exported to the world for alteration of events.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
evex_update_event()
|
2005-12-08 00:17:05 +01:00
|
|
|
thd THD
|
|
|
|
et event's data
|
|
|
|
new_name set in case of RENAME TO.
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
NOTES
|
|
|
|
et contains data about dbname and event name.
|
2006-02-14 16:20:48 +01:00
|
|
|
new_name is the new name of the event, if not null (this means
|
|
|
|
that RENAME TO was specified in the query)
|
2005-12-02 13:22:15 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
2005-12-28 12:07:57 +02:00
|
|
|
evex_update_event(THD *thd, event_timed *et, sp_name *new_name,
|
|
|
|
uint *rows_affected)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
int ret, i;
|
|
|
|
bool need_second_pass= true;
|
|
|
|
|
|
|
|
DBUG_ENTER("evex_update_event");
|
2005-12-08 00:17:05 +01:00
|
|
|
DBUG_PRINT("enter", ("name: %*s", et->name.length, et->name.str));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-07 19:26:44 +01:00
|
|
|
/*
|
|
|
|
db_update_event() opens & closes the table to prevent
|
2005-12-08 15:34:11 +01:00
|
|
|
crash later in the code when loading and compiling the new definition.
|
|
|
|
Also on error conditions my_error() is called so no need to handle here
|
2005-12-07 19:26:44 +01:00
|
|
|
*/
|
2005-12-08 15:34:11 +01:00
|
|
|
if ((ret= db_update_event(thd, et, new_name)))
|
2005-12-07 19:26:44 +01:00
|
|
|
goto done;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_evex_running));
|
|
|
|
if (!evex_is_running)
|
2005-12-07 22:29:00 +01:00
|
|
|
UNLOCK_MUTEX_AND_BAIL_OUT(LOCK_evex_running, done);
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_event_arrays));
|
2006-01-20 22:24:58 +01:00
|
|
|
evex_remove_from_cache(&et->dbname, &et->name, false, false);
|
2005-12-08 00:17:05 +01:00
|
|
|
if (et->status == MYSQL_EVENT_ENABLED)
|
2005-12-08 15:34:11 +01:00
|
|
|
{
|
|
|
|
if (new_name)
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
ret= evex_load_and_compile_event(thd, new_name, et->definer, false);
|
2005-12-06 16:15:29 +01:00
|
|
|
else
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-08 15:34:11 +01:00
|
|
|
sp_name spn(et->dbname, et->name);
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
ret= evex_load_and_compile_event(thd, &spn, et->definer, false);
|
2005-12-06 16:15:29 +01:00
|
|
|
}
|
2005-12-08 15:34:11 +01:00
|
|
|
if (ret == EVEX_COMPILE_ERROR)
|
|
|
|
my_error(ER_EVENT_COMPILE_ERROR, MYF(0));
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
VOID(pthread_mutex_unlock(&LOCK_event_arrays));
|
2005-12-07 22:29:00 +01:00
|
|
|
VOID(pthread_mutex_unlock(&LOCK_evex_running));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2005-12-07 22:29:00 +01:00
|
|
|
done:
|
2005-12-02 13:22:15 +01:00
|
|
|
DBUG_RETURN(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Drops an event
|
|
|
|
|
|
|
|
SYNOPSIS
|
2006-02-07 19:28:33 +01:00
|
|
|
db_drop_event()
|
2005-12-02 13:22:15 +01:00
|
|
|
thd THD
|
|
|
|
et event's name
|
|
|
|
drop_if_exists if set and the event not existing => warning onto the stack
|
2006-02-07 19:28:33 +01:00
|
|
|
rows_affected affected number of rows is returned heres
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
*/
|
|
|
|
|
2006-02-07 19:28:33 +01:00
|
|
|
int db_drop_event(THD *thd, event_timed *et, bool drop_if_exists,
|
|
|
|
uint *rows_affected)
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
|
|
|
TABLE *table;
|
2006-02-07 19:28:33 +01:00
|
|
|
Open_tables_state backup;
|
2006-02-15 23:43:11 +01:00
|
|
|
int ret;
|
2006-02-07 19:28:33 +01:00
|
|
|
|
|
|
|
DBUG_ENTER("db_drop_event");
|
|
|
|
ret= EVEX_OPEN_TABLE_FAILED;
|
2005-12-02 13:22:15 +01:00
|
|
|
|
2006-02-07 19:28:33 +01:00
|
|
|
thd->reset_n_backup_open_tables_state(&backup);
|
2005-12-16 12:42:39 +01:00
|
|
|
if (evex_open_event_table(thd, TL_WRITE, &table))
|
2005-12-07 22:29:00 +01:00
|
|
|
{
|
|
|
|
my_error(ER_EVENT_OPEN_TABLE_FAILED, MYF(0));
|
|
|
|
goto done;
|
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
fix for bug#16642 (Events: No INFORMATION_SCHEMA.EVENTS table)
post-review change - use pointer instead of copy on the stack.
WL#1034 (Internal CRON)
This patch adds INFORMATION_SCHEMA.EVENTS table with the following format:
EVENT_CATALOG - MYSQL_TYPE_STRING (Always NULL)
EVENT_SCHEMA - MYSQL_TYPE_STRING (the database)
EVENT_NAME - MYSQL_TYPE_STRING (the name)
DEFINER - MYSQL_TYPE_STRING (user@host)
EVENT_BODY - MYSQL_TYPE_STRING (the body from mysql.event)
EVENT_TYPE - MYSQL_TYPE_STRING ("ONE TIME" | "RECURRING")
EXECUTE_AT - MYSQL_TYPE_TIMESTAMP (set for "ONE TIME" otherwise NULL)
INTERVAL_VALUE - MYSQL_TYPE_LONG (set for RECURRING otherwise NULL)
INTERVAL_FIELD - MYSQL_TYPE_STRING (set for RECURRING otherwise NULL)
SQL_MODE - MYSQL_TYPE_STRING (for now NULL)
STARTS - MYSQL_TYPE_TIMESTAMP (starts from mysql.event)
ENDS - MYSQL_TYPE_TIMESTAMP (ends from mysql.event)
STATUS - MYSQL_TYPE_STRING (ENABLED | DISABLED)
ON_COMPLETION - MYSQL_TYPE_STRING (NOT PRESERVE | PRESERVE)
CREATED - MYSQL_TYPE_TIMESTAMP
LAST_ALTERED - MYSQL_TYPE_TIMESTAMP
LAST_EXECUTED - MYSQL_TYPE_TIMESTAMP
EVENT_COMMENT - MYSQL_TYPE_STRING
SQL_MODE is NULL for now, because the value is still not stored in mysql.event .
Support will be added as a fix for another bug.
This patch also adds SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
1. SHOW EVENTS shows always only the events on the same user,
because the PK of mysql.event is (definer, db, name) several
users may have event with the same name -> no information disclosure.
2. SHOW FULL EVENTS - shows the events (in the current db as SHOW EVENTS)
of all users. The user has to have PROCESS privilege, if not then
SHOW FULL EVENTS behave like SHOW EVENTS.
3. If [FROM db] is specified then this db is considered.
4. Event names can be filtered with LIKE pattern.
SHOW EVENTS returns table with the following columns, which are subset of
the data which is returned by SELECT * FROM I_S.EVENTS
Db
Name
Definer
Type
Execute at
Interval value
Interval field
Starts
Ends
Status
mysql-test/lib/init_db.sql:
change the PK - (definer, db, name)
quicker searches when SHOW EVENTS;
allow also different users to have events with the same name ->
no information disclosure
mysql-test/r/events.result:
result of new tests
mysql-test/r/information_schema.result:
result of new tests
mysql-test/r/information_schema_db.result:
result of new tests
mysql-test/r/system_mysql_db.result:
result of new tests
mysql-test/t/events.test:
new tests for information_schema.events
scripts/mysql_create_system_tables.sh:
change the PK of mysql.event to (definer, db, name)
scripts/mysql_fix_privilege_tables.sql:
change the PK of mysql.event to (definer, db, name)
sql/event.cc:
pass around the definer of the event because of the new PK
which is (definer, db, name). It's needed for index searching.
sql/event.h:
- make enum evex_table_field again public so it can be used
in sql_show.cc
- make created and modified ulonglong, because they should be such
- make public evex_open_event_table so it can be used in sql_show.cc
sql/event_executor.cc:
- cosmetics
sql/event_priv.h:
- moved enum evex_table_field and evex_open_event_table()
to event.h (made them therefore public)
sql/event_timed.cc:
- in event_timed::init_definer() always fill this.definer with
the concatenated value of definer_user@definer_host. Makes
later the work easier.
- pass around the definer wherever is needed for searching
(new prototype of evex_db_find_evex_aux)
sql/mysqld.cc:
- add counter for SHOW EVENTS
sql/sql_lex.h:
- register SHOW EVENTS as command
sql/sql_parse.cc:
- handle SCH_EVENTS (I_S.EVENTS like SCH_TRIGGERS)
- make additional check in case of SHOW EVENTS (check for EVENT on
the current database. if it is null check_access() gives appropriate
message back.
sql/sql_show.cc:
- add INFORMATION_SCHEMA.EVENTS and SHOW EVENTS
- I_S.EVENTS.SQL_MODE is NULL for now -> not implemented. Trudy
asked to be added so bug #16642 can be completely closed. There
is another bug report which will fix the lack of storage of
SQL_MODE during event creation.
sql/sql_yacc.yy:
- always call event_timed::init_definer() when CREATE/ALTER/DROP
EVENT but not when just compiling the body of the event because
in this case this operation is not needed, it takes memory and
CPU time and at the end the result is not used. event_timed::definer
is used only on SQLCOM_CREATE/ALTER/DROP_EVENT execution not on
statement compilation.
- add SHOW [FULL] EVENTS [FROM db] [LIKE pattern]
in case of FULL and the user has PROCESS privilege then he will see
also others' events in the current database, otherwise the output
is the same as of SHOW EVENTS. Because the events are per DB only
the events from the current database are shown. pattern is applied
against event name. FROM db is self explanatory.
sql/table.h:
add SCH_EVENTS as part of INFORMATION_SCHEMA
2006-01-30 13:15:23 +01:00
|
|
|
if (!(ret= evex_db_find_event_aux(thd, et->dbname,et->name,et->definer,table)))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2006-01-11 12:49:56 +01:00
|
|
|
if ((ret= table->file->ha_delete_row(table->record[0])))
|
2005-12-02 13:22:15 +01:00
|
|
|
{
|
2005-12-07 19:26:44 +01:00
|
|
|
my_error(ER_EVENT_CANNOT_DELETE, MYF(0));
|
2005-12-02 13:22:15 +01:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
2005-12-08 15:34:11 +01:00
|
|
|
else if (ret == EVEX_KEY_NOT_FOUND)
|
|
|
|
{
|
|
|
|
if (drop_if_exists)
|
|
|
|
{
|
|
|
|
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,
|
2005-12-02 13:22:15 +01:00
|
|
|
ER_SP_DOES_NOT_EXIST, ER(ER_SP_DOES_NOT_EXIST),
|
2005-12-08 15:34:11 +01:00
|
|
|
"Event", et->name.str);
|
|
|
|
ret= 0;
|
|
|
|
} else
|
|
|
|
my_error(ER_EVENT_DOES_NOT_EXIST, MYF(0), et->name.str);
|
2005-12-02 13:22:15 +01:00
|
|
|
goto done;
|
2005-12-08 15:34:11 +01:00
|
|
|
}
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
|
2005-12-20 14:21:02 +02:00
|
|
|
done:
|
2005-12-07 19:26:44 +01:00
|
|
|
/*
|
2005-12-20 14:21:02 +02:00
|
|
|
evex_drop_event() is used by event_timed::drop therefore
|
|
|
|
we have to close our thread tables.
|
2005-12-07 19:26:44 +01:00
|
|
|
*/
|
2005-12-20 14:21:02 +02:00
|
|
|
close_thread_tables(thd);
|
2006-02-07 19:28:33 +01:00
|
|
|
thd->restore_backup_open_tables_state(&backup);
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Drops an event
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
evex_drop_event()
|
|
|
|
thd THD
|
|
|
|
et event's name
|
|
|
|
drop_if_exists if set and the event not existing => warning onto the stack
|
|
|
|
rows_affected affected number of rows is returned heres
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
evex_drop_event(THD *thd, event_timed *et, bool drop_if_exists,
|
|
|
|
uint *rows_affected)
|
|
|
|
{
|
|
|
|
TABLE *table;
|
|
|
|
int ret= 0;
|
|
|
|
|
|
|
|
DBUG_ENTER("evex_drop_event");
|
|
|
|
|
|
|
|
|
|
|
|
VOID(pthread_mutex_lock(&LOCK_evex_running));
|
|
|
|
if (evex_is_running)
|
|
|
|
ret= evex_remove_from_cache(&et->dbname, &et->name, true, true);
|
|
|
|
VOID(pthread_mutex_unlock(&LOCK_evex_running));
|
|
|
|
|
|
|
|
if (ret == 1)
|
|
|
|
ret= 0;
|
|
|
|
else if (ret == 0)
|
|
|
|
ret= db_drop_event(thd, et, drop_if_exists, rows_affected);
|
|
|
|
else
|
|
|
|
my_error(ER_UNKNOWN_ERROR, MYF(0));
|
2005-12-02 13:22:15 +01:00
|
|
|
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
}
|
|
|
|
|
2006-02-14 16:20:48 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
SHOW CREATE EVENT
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
evex_show_create_event()
|
|
|
|
thd THD
|
|
|
|
spn the name of the event (db, name)
|
|
|
|
definer the definer of the event
|
|
|
|
|
|
|
|
RETURNS
|
|
|
|
0 - OK
|
|
|
|
1 - Error during writing to the wire
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
int
|
|
|
|
evex_show_create_event(THD *thd, sp_name *spn, LEX_STRING definer)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
event_timed *et= NULL;
|
|
|
|
Open_tables_state backup;
|
|
|
|
|
|
|
|
DBUG_ENTER("evex_update_event");
|
|
|
|
DBUG_PRINT("enter", ("name: %*s", spn->m_name.length, spn->m_name.str));
|
|
|
|
|
|
|
|
thd->reset_n_backup_open_tables_state(&backup);
|
|
|
|
ret= db_find_event(thd, spn, &definer, &et, NULL, thd->mem_root);
|
|
|
|
thd->restore_backup_open_tables_state(&backup);
|
|
|
|
|
|
|
|
if (!ret && et)
|
|
|
|
{
|
|
|
|
Protocol *protocol= thd->protocol;
|
|
|
|
char show_str_buf[768];
|
|
|
|
String show_str(show_str_buf, sizeof(show_str_buf), system_charset_info);
|
|
|
|
List<Item> field_list;
|
|
|
|
const char *sql_mode_str;
|
|
|
|
ulong sql_mode_len=0;
|
|
|
|
|
|
|
|
show_str.length(0);
|
|
|
|
show_str.set_charset(system_charset_info);
|
|
|
|
|
|
|
|
if (et->get_create_event(thd, &show_str))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
field_list.push_back(new Item_empty_string("Event", NAME_LEN));
|
|
|
|
|
|
|
|
sql_mode_str=
|
|
|
|
sys_var_thd_sql_mode::symbolic_mode_representation(thd, et->sql_mode,
|
|
|
|
&sql_mode_len);
|
|
|
|
|
|
|
|
field_list.push_back(new Item_empty_string("sql_mode", sql_mode_len));
|
|
|
|
|
|
|
|
field_list.push_back(new Item_empty_string("Create Event",
|
|
|
|
show_str.length()));
|
|
|
|
if (protocol->send_fields(&field_list, Protocol::SEND_NUM_ROWS |
|
|
|
|
Protocol::SEND_EOF))
|
|
|
|
DBUG_RETURN(1);
|
|
|
|
|
|
|
|
protocol->prepare_for_resend();
|
|
|
|
protocol->store(et->name.str, et->name.length, system_charset_info);
|
|
|
|
|
|
|
|
protocol->store((char*) sql_mode_str, sql_mode_len, system_charset_info);
|
|
|
|
|
|
|
|
|
|
|
|
protocol->store(show_str.c_ptr(), show_str.length(), system_charset_info);
|
|
|
|
ret= protocol->write();
|
|
|
|
send_eof(thd);
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_RETURN(ret);
|
|
|
|
}
|