mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01: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.
109 lines
3.6 KiB
C
109 lines
3.6 KiB
C
/* Copyright (C) 2004 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
/*
|
|
This is a private header of sql-common library, containing
|
|
declarations for my_time.c
|
|
*/
|
|
|
|
#ifndef _my_time_h_
|
|
#define _my_time_h_
|
|
#include "my_global.h"
|
|
#include "mysql_time.h"
|
|
|
|
C_MODE_START
|
|
|
|
extern ulonglong log_10_int[20];
|
|
extern uchar days_in_month[];
|
|
|
|
/*
|
|
Portable time_t replacement.
|
|
Should be signed and hold seconds for 1902-2038 range.
|
|
*/
|
|
typedef long my_time_t;
|
|
|
|
#define MY_TIME_T_MAX LONG_MAX
|
|
#define MY_TIME_T_MIN LONG_MIN
|
|
|
|
#define YY_PART_YEAR 70
|
|
|
|
/* Flags to str_to_datetime */
|
|
#define TIME_FUZZY_DATE 1
|
|
#define TIME_DATETIME_ONLY 2
|
|
/* Must be same as MODE_NO_ZERO_IN_DATE */
|
|
#define TIME_NO_ZERO_IN_DATE (65536L*2*2*2*2*2*2*2)
|
|
/* Must be same as MODE_NO_ZERO_DATE */
|
|
#define TIME_NO_ZERO_DATE (TIME_NO_ZERO_IN_DATE*2)
|
|
#define TIME_INVALID_DATES (TIME_NO_ZERO_DATE*2)
|
|
|
|
enum enum_mysql_timestamp_type
|
|
str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
|
|
uint flags, int *was_cut);
|
|
longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
|
|
uint flags, int *was_cut);
|
|
ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *time);
|
|
ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *time);
|
|
ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *time);
|
|
ulonglong TIME_to_ulonglong(const MYSQL_TIME *time);
|
|
|
|
|
|
my_bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time,
|
|
int *was_cut);
|
|
|
|
long calc_daynr(uint year,uint month,uint day);
|
|
uint calc_days_in_year(uint year);
|
|
|
|
void init_time(void);
|
|
|
|
my_time_t
|
|
my_system_gmt_sec(const MYSQL_TIME *t, long *my_timezone,
|
|
my_bool *in_dst_time_gap);
|
|
|
|
void set_zero_time(MYSQL_TIME *tm, enum enum_mysql_timestamp_type time_type);
|
|
|
|
/*
|
|
Required buffer length for my_time_to_str, my_date_to_str,
|
|
my_datetime_to_str and TIME_to_string functions. Note, that the
|
|
caller is still responsible to check that given TIME structure
|
|
has values in valid ranges, otherwise size of the buffer could
|
|
be not enough. We also rely on the fact that even wrong values
|
|
sent using binary protocol fit in this buffer.
|
|
*/
|
|
#define MAX_DATE_STRING_REP_LENGTH 30
|
|
|
|
int my_time_to_str(const MYSQL_TIME *l_time, char *to);
|
|
int my_date_to_str(const MYSQL_TIME *l_time, char *to);
|
|
int my_datetime_to_str(const MYSQL_TIME *l_time, char *to);
|
|
int my_TIME_to_str(const MYSQL_TIME *l_time, char *to);
|
|
|
|
/*
|
|
The following must be sorted so that simple intervals comes first.
|
|
(get_interval_value() depends on this)
|
|
*/
|
|
|
|
enum interval_type
|
|
{
|
|
INTERVAL_YEAR, INTERVAL_QUARTER, INTERVAL_MONTH, INTERVAL_DAY, INTERVAL_HOUR,
|
|
INTERVAL_MINUTE, INTERVAL_WEEK, INTERVAL_SECOND, INTERVAL_MICROSECOND ,
|
|
INTERVAL_YEAR_MONTH, INTERVAL_DAY_HOUR, INTERVAL_DAY_MINUTE,
|
|
INTERVAL_DAY_SECOND, INTERVAL_HOUR_MINUTE, INTERVAL_HOUR_SECOND,
|
|
INTERVAL_MINUTE_SECOND, INTERVAL_DAY_MICROSECOND, INTERVAL_HOUR_MICROSECOND,
|
|
INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND
|
|
};
|
|
|
|
C_MODE_END
|
|
|
|
#endif /* _my_time_h_ */
|