mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 22:12:30 +01:00
086fba7627
BUG#26429: SHOW CREATE EVENT is incorrect for an event that
STARTS NOW()
BUG#26431: Impossible to re-create an event from backup if its
STARTS clause is in the past
WL#3698: Events: execution in local time zone
The problem was that local times specified by the user in AT, STARTS
and ENDS of CREATE EVENT/ALTER EVENT statement were converted to UTC,
and the original time zone was forgotten. This way, event scheduler
couldn't honor Daylight Saving Time shifts, and times shown to the
user were also in UTC. Additionally, CREATE EVENT didn't allow times
in the past, thus preventing straightforward event restoration from
old backups.
This patch reworks event scheduler time computations, performing them
in the time zone associated with the event. Also it allows times to
be in the past.
The patch adds time_zone column to mysql.event table.
NOTE: The patch is almost final, but the bug#9953 should be pushed
first.
client/mysqldump.c:
Before every CREATE EVENT, output its time zone.
mysql-test/include/wait_condition.inc:
Add optional $wait_timeout parameter.
mysql-test/lib/init_db.sql:
Add time_zone column.
mysql-test/r/events.result:
Update result.
mysql-test/r/events_bugs.result:
Update result.
mysql-test/r/events_grant.result:
Update result.
mysql-test/r/events_restart_phase1.result:
Update result.
mysql-test/r/events_scheduling.result:
Update result.
mysql-test/r/mysqldump.result:
Update result.
mysql-test/r/ps.result:
Update result.
mysql-test/r/system_mysql_db.result:
Update result.
mysql-test/t/events.test:
Remove STARTS from the result, as it depends on current time.
mysql-test/t/events_bugs.test:
Time in the past is no longer an error.
mysql-test/t/events_restart_phase1.test:
Fill new column 'time_zone' in mysql.event.
mysql-test/t/events_scheduling.test:
Cleanup: disable event scheduler.
scripts/mysql_create_system_tables.sh:
Add new column 'time_zone' to mysql.event.
scripts/mysql_fix_privilege_tables.sql:
Add new column 'time_zone' to mysql.event.
sql/event_data_objects.cc:
The essence of the change is the following:
- for internal times use my_time_t instead of TIME. Assignment and
comparison is done now on plain numbers.
- in init_execute_at(), init_starts(), init_ends() convert given time
to number of seconds since Epoch (aka Unix time, in UTC).
- handle time_zone field loading and storing.
- in get_next_time(), Unix time is converted back to event time zone,
interval is added, and the result is converted to UTC again.
- fix Event_timed::get_create_event() to report STARTS and ENDS.
- before executing the event body we set thread time zone to the
event time zone.
sql/event_data_objects.h:
Add time_zone member to Event_basic class.
Store internal times in my_time_t (number of seconds since Epoch),
rather than in broken down TIME structure.
sql/event_db_repository.cc:
Add time_zone column handling.
Give a warning and do not create an event if its execution time is in
the past, and ON COMPLETION NOT PRESERVE is set, because such an event
should be dropped by that time. Also, do not allow ALTER EVENT to
set execution time in the past when ON COMPLETION NOT PRESERVE is set.
sql/event_db_repository.h:
Add enum member for new time zone column.
sql/event_queue.cc:
Replace handling of broken down times with simple handling of
my_time_t.
sql/event_queue.h:
Store internal times in my_time_t (number of seconds since Epoch),
rather than in broken down TIME structure.
sql/event_scheduler.cc:
Add TODO comment.
sql/events.cc:
Send time_zone column for SHOW CREATE EVENT.
sql/share/errmsg.txt:
Update error message, and add two more errors.
sql/sql_show.cc:
Add TIME_ZONE column to the output of SHOW EVENTS.
mysql-test/r/events_time_zone.result:
BitKeeper file /home/tomash/src/mysql_ab/mysql-5.1-wl3698/mysql-test/r/events_time_zone.result
mysql-test/t/events_time_zone.test:
BitKeeper file /home/tomash/src/mysql_ab/mysql-5.1-wl3698/mysql-test/t/events_time_zone.test
113 lines
2.7 KiB
C++
113 lines
2.7 KiB
C++
#ifndef _EVENT_QUEUE_H_
|
|
#define _EVENT_QUEUE_H_
|
|
/* Copyright (C) 2004-2006 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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
class Event_basic;
|
|
class Event_queue_element;
|
|
class Event_queue_element_for_exec;
|
|
|
|
class THD;
|
|
|
|
class Event_queue
|
|
{
|
|
public:
|
|
Event_queue();
|
|
|
|
void
|
|
init_mutexes();
|
|
|
|
void
|
|
deinit_mutexes();
|
|
|
|
bool
|
|
init_queue(THD *thd);
|
|
|
|
void
|
|
deinit_queue();
|
|
|
|
/* Methods for queue management follow */
|
|
|
|
void
|
|
create_event(THD *thd, Event_queue_element *new_element);
|
|
|
|
void
|
|
update_event(THD *thd, LEX_STRING dbname, LEX_STRING name,
|
|
Event_queue_element *new_element);
|
|
|
|
void
|
|
drop_event(THD *thd, LEX_STRING dbname, LEX_STRING name);
|
|
|
|
void
|
|
drop_schema_events(THD *thd, LEX_STRING schema);
|
|
|
|
void
|
|
recalculate_activation_times(THD *thd);
|
|
|
|
bool
|
|
get_top_for_execution_if_time(THD *thd,
|
|
Event_queue_element_for_exec **event_name);
|
|
|
|
|
|
void
|
|
dump_internal_status();
|
|
|
|
void
|
|
empty_queue();
|
|
protected:
|
|
void
|
|
find_n_remove_event(LEX_STRING db, LEX_STRING name);
|
|
|
|
|
|
void
|
|
drop_matching_events(THD *thd, LEX_STRING pattern,
|
|
bool (*)(LEX_STRING, Event_basic *));
|
|
|
|
|
|
void
|
|
dbug_dump_queue(time_t now);
|
|
|
|
/* LOCK_event_queue is the mutex which protects the access to the queue. */
|
|
pthread_mutex_t LOCK_event_queue;
|
|
pthread_cond_t COND_queue_state;
|
|
|
|
/* The sorted queue with the Event_queue_element objects */
|
|
QUEUE queue;
|
|
|
|
my_time_t next_activation_at;
|
|
|
|
uint mutex_last_locked_at_line;
|
|
uint mutex_last_unlocked_at_line;
|
|
uint mutex_last_attempted_lock_at_line;
|
|
const char* mutex_last_locked_in_func;
|
|
const char* mutex_last_unlocked_in_func;
|
|
const char* mutex_last_attempted_lock_in_func;
|
|
bool mutex_queue_data_locked;
|
|
bool mutex_queue_data_attempting_lock;
|
|
bool waiting_on_cond;
|
|
|
|
/* helper functions for working with mutexes & conditionals */
|
|
void
|
|
lock_data(const char *func, uint line);
|
|
|
|
void
|
|
unlock_data(const char *func, uint line);
|
|
|
|
void
|
|
cond_wait(THD *thd, struct timespec *abstime, const char* msg,
|
|
const char *func, uint line);
|
|
};
|
|
|
|
#endif /* _EVENT_QUEUE_H_ */
|