mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
8d4f74be2d
- fix for bug#16423 (Events: SHOW CREATE EVENT doesn't work)
- this Changeset commits makes CREATE/UPDATE/DELETE EVENT real DDL statements
by committing the currently open transaction before they are executed.
- this Changeset also fixes a trailing space problem since the very early days
of the internal cron
- adds sophisticated checking of whether mysql.event was tampered accidentally
or with purpose by an user.
- adds a lot of inline function documentation - documents everything left
uncodumented
- INTERVAL_XXXX to XXX in I_S.EVENTS.INTERVAL_FIELD
WL#1034 (Internal CRON)
mysql-test/r/events.result:
update result
mysql-test/t/events.test:
add test cases for SHOW CREATE EVENT
add test cases where the structure of mysql.event is changed and error reporting in this case
sql/event.cc:
- do a lot more checking on mysql.event whether it's valid
introduced generic function table_check_intact() which can be used also
for checking whether a system table (mysql.*) has been tampered by user
and report an error in this case. The checking is quite strict, thus
maybe some mechanism can be added later that loosens this like some
session variable, for instance, i_am_aware_that_i_can_damage_my_data
so the table will be opened nevertheless we think that it's not valid.
- add evex_show_create_event(THD *thd, sp_name *spn, LEX_STRING definer)
- document a loooot. not a single function left undocumented.
sql/event.h:
- add evex_show_create_event(THD *thd, sp_name *spn, LEX_STRING definer)
- change get_show_create_event() to get_create_event()
- add TABLE_FIELD_W_TYPE used by table_check_intact()
- add event_timed::sql_mode so it can be used by show create event. currently
always 0, will be fixed by a patch for another bug. At least makes the code
of show create event complete.
sql/event_executor.cc:
- add evex_check_system_tables() that checks on boot and event
main thread startup that mysql.db and mysql.user tables are correct.
- document everything!
sql/event_priv.h:
remove a line
sql/event_timed.cc:
- implement SHOW CREATE EVENT
- document undocumented functions!
sql/share/errmsg.txt:
- fix an error message and add two new
sql/sql_acl.cc:
- add mysql.db table definition to use by table_check_intact()
- exchange some of the positions by numbers from mysql.db to enum names (see sql_acl.h)
sql/sql_acl.h:
- define the structure of mysql.db table
sql/sql_parse.cc:
- handle SQLCOM_SHOW_CREATE_EVENT
- end the current transaction becase CREATE/UPDATE/DELETE EVENT is a DDL
statement
sql/sql_show.cc:
- remove interval_type_to_name
- use common function event_reconstruct_interval_expression()
that reconstructs the expression given at create/alter, to some
extent - interval of 2:62 MINUTE_SECOND will be reconstructed as
interval of 3:02 MINUTE_SECOND!
sql/sql_yacc.yy:
init the definer of event_timed also when doing SHOW CREATE EVENT
because it's needed for checking into mysql.event
sql/table.cc:
- remove stale code. only mysql.event should be a 'system_table'
- add table_check_intact() to check the consistency of a table.
mostly usable with mysql.xxx tables.
sql/table.h:
- export TABLE_FIELD_W_TYPE and table_check_intact() which are used for
checking the structure of a table. mostly usable for mysql.xxx tables.
78 lines
2.5 KiB
C
78 lines
2.5 KiB
C
/* Copyright (C) 2004-2005 MySQL AB
|
|
|
|
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 */
|
|
|
|
#ifndef _EVENT_PRIV_H_
|
|
#define _EVENT_PRIV_H_
|
|
#include "mysql_priv.h"
|
|
|
|
|
|
#define EVEX_USE_QUEUE
|
|
|
|
#define UNLOCK_MUTEX_AND_BAIL_OUT(__mutex, __label) \
|
|
{ VOID(pthread_mutex_unlock(&__mutex)); goto __label; }
|
|
|
|
#define EVEX_DB_FIELD_LEN 64
|
|
#define EVEX_NAME_FIELD_LEN 64
|
|
#define EVEX_MAX_INTERVAL_VALUE 2147483647L
|
|
|
|
int
|
|
my_time_compare(TIME *a, TIME *b);
|
|
|
|
int
|
|
evex_db_find_event_aux(THD *thd, const LEX_STRING dbname,
|
|
const LEX_STRING rname,
|
|
const LEX_STRING definer,
|
|
TABLE *table);
|
|
|
|
int
|
|
event_timed_compare_q(void *vptr, byte* a, byte *b);
|
|
|
|
int db_drop_event(THD *thd, event_timed *et, bool drop_if_exists,
|
|
uint *rows_affected);
|
|
|
|
|
|
#define EXEC_QUEUE_QUEUE_NAME executing_queue
|
|
#define EXEC_QUEUE_DARR_NAME evex_executing_queue
|
|
|
|
|
|
#define EVEX_QUEUE_TYPE QUEUE
|
|
#define EVEX_PTOQEL byte *
|
|
|
|
#define EVEX_EQ_NAME executing_queue
|
|
#define evex_queue_first_element(queue, __cast) ((__cast)queue_top(queue))
|
|
#define evex_queue_element(queue, idx, __cast) ((__cast)queue_element(queue, idx))
|
|
#define evex_queue_delete_element(queue, idx) queue_remove(queue, idx)
|
|
#define evex_queue_destroy(queue) delete_queue(queue)
|
|
#define evex_queue_first_updated(queue) queue_replaced(queue)
|
|
#define evex_queue_insert(queue, element) queue_insert_safe(queue, element);
|
|
|
|
|
|
|
|
void
|
|
evex_queue_init(EVEX_QUEUE_TYPE *queue);
|
|
|
|
#define evex_queue_num_elements(queue) queue.elements
|
|
|
|
|
|
extern bool evex_is_running;
|
|
extern MEM_ROOT evex_mem_root;
|
|
extern pthread_mutex_t LOCK_event_arrays,
|
|
LOCK_workers_count,
|
|
LOCK_evex_running;
|
|
extern ulonglong evex_main_thread_id;
|
|
extern QUEUE EVEX_EQ_NAME;
|
|
|
|
#endif /* _EVENT_PRIV_H_ */
|