mirror of
https://github.com/MariaDB/server.git
synced 2025-07-08 17:02:21 +03:00
6bd58a2a3c
Before the interval expression was considered to be in seconds, now it is
just a number and the type of interval is considered.
- this changeset introduces also fix for bug#16432 (Events: error re interval
misrepresents the facts)
the code of event_timed::set_interval() was refactored anyway so it is meaningful to
fix the bug in the same changeset.
include/my_time.h:
- move enum interval_type to include/my_time.h so it can be used by functions
in the whole server
sql/event.cc:
- don't use second_part
- fix small problem with create event xyz, when xyz exists -> make it error
instead of warning if create_if_not is false.
sql/event.h:
pass thd to mark_last_executed() to be able to call thd->end_time()
sql/event_executor.cc:
- pass thd to event_timed::compute_next_execution_time()
- a bit more DBUG info in the server log
- handle error returned by event_timed::compute_next_execution_time()
sql/event_priv.h:
- define the maximal possible value for interval_value
sql/event_timed.cc:
- more docs
- add static get_next_time() which sums a TIME with an interval
- fix bug #16435 (Weekly events execute every second)
Before the interval expression was considered to be in seconds, now it is
just a number and the type of interval is considered.
- fix for bug#16432 (Events: error re interval misrepresents the facts)
(return an error if a value is too big or is negative - errmsg changed)
sql/item_timefunc.cc:
- export get_interval_date()
- refactor Item_date_add_interval::get_date() and extract the core
to date_add_interval() in time.cc so it can be reused by the
scheduler code in event_timed.cc
sql/item_timefunc.h:
- export get_interval_value() so it can be reused in event_timed.cc in
function static get_next_time()
- move enum interval_type to include/my_time.h so it can be used by functions
in the whole server
sql/mysql_priv.h:
export the new function date_add_interval() added to time.cc
sql/share/errmsg.txt:
- change error message to be appropriate as fix for bug#16432
(Events: error re interval misrepresents the facts)
sql/sql_yacc.yy:
- change error message to be appropriate as fix for bug#16432
(Events: error re interval misrepresents the facts)
sql/time.cc:
extract the core of Item_date_add_interval::get_date()
to a function per Serg's request. The code can be reused
to add und substract interval from a date.
97 lines
2.8 KiB
C
97 lines
2.8 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; }
|
|
|
|
enum evex_table_field
|
|
{
|
|
EVEX_FIELD_DB = 0,
|
|
EVEX_FIELD_NAME,
|
|
EVEX_FIELD_BODY,
|
|
EVEX_FIELD_DEFINER,
|
|
EVEX_FIELD_EXECUTE_AT,
|
|
EVEX_FIELD_INTERVAL_EXPR,
|
|
EVEX_FIELD_TRANSIENT_INTERVAL,
|
|
EVEX_FIELD_CREATED,
|
|
EVEX_FIELD_MODIFIED,
|
|
EVEX_FIELD_LAST_EXECUTED,
|
|
EVEX_FIELD_STARTS,
|
|
EVEX_FIELD_ENDS,
|
|
EVEX_FIELD_STATUS,
|
|
EVEX_FIELD_ON_COMPLETION,
|
|
EVEX_FIELD_COMMENT,
|
|
EVEX_FIELD_COUNT /* a cool trick to count the number of fields :) */
|
|
} ;
|
|
|
|
#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, TABLE *table);
|
|
|
|
int
|
|
evex_open_event_table(THD *thd, enum thr_lock_type lock_type, TABLE **table);
|
|
|
|
int
|
|
event_timed_compare_q(void *vptr, byte* a, byte *b);
|
|
|
|
|
|
#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_ */
|