Skip to content

Commit 274d19a

Browse files
committed
Bug#29159867: MAIN.MYSQLDUMP FAILS WITH EVENT CREATED IN THE PAST
main.mysqldump started failing as we entered 2019 as it contained the creation of an event starting 31/12/2018, which now is in the past. Fix this by kicking the can 11 years down the road... Change-Id: I9a19d218dba117595af587f8fa9de86554fc738c
1 parent b087663 commit 274d19a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

mysql-test/r/mysqldump.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4210,20 +4210,20 @@ second ee1 root@localhost UTC ONE TIME 2035-12-31 20:01:23 NULL NULL NULL NULL E
42104210
show create event ee1;
42114211
Event sql_mode time_zone Create Event character_set_client collation_connection Database Collation
42124212
ee1 UTC CREATE DEFINER=`root`@`localhost` EVENT `ee1` ON SCHEDULE AT '2035-12-31 20:01:23' ON COMPLETION NOT PRESERVE ENABLE DO set @a=5 latin1 latin1_swedish_ci latin1_swedish_ci
4213-
create event ee2 on schedule at '2018-12-31 21:01:23' do set @a=5;
4213+
create event ee2 on schedule at '2029-12-31 21:01:23' do set @a=5;
42144214
create event ee3 on schedule at '2030-12-31 22:01:23' do set @a=5;
42154215
show events;
42164216
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
42174217
second ee1 root@localhost UTC ONE TIME 2035-12-31 20:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
4218-
second ee2 root@localhost UTC ONE TIME 2018-12-31 21:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
4218+
second ee2 root@localhost UTC ONE TIME 2029-12-31 21:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
42194219
second ee3 root@localhost UTC ONE TIME 2030-12-31 22:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
42204220
drop database second;
42214221
create database third;
42224222
use third;
42234223
show events;
42244224
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation
42254225
third ee1 root@localhost UTC ONE TIME 2035-12-31 20:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
4226-
third ee2 root@localhost UTC ONE TIME 2018-12-31 21:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
4226+
third ee2 root@localhost UTC ONE TIME 2029-12-31 21:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
42274227
third ee3 root@localhost UTC ONE TIME 2030-12-31 22:01:23 NULL NULL NULL NULL ENABLED 1 latin1 latin1_swedish_ci latin1_swedish_ci
42284228
drop database third;
42294229
set time_zone = 'SYSTEM';

mysql-test/t/mysqldump.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,7 @@ show create event ee1;
17671767

17681768
## prove three works (with spaces and tabs on the end)
17691769
# start with one from the previous restore
1770-
create event ee2 on schedule at '2018-12-31 21:01:23' do set @a=5;
1770+
create event ee2 on schedule at '2029-12-31 21:01:23' do set @a=5;
17711771
create event ee3 on schedule at '2030-12-31 22:01:23' do set @a=5;
17721772
show events;
17731773
--exec $MYSQL_DUMP --events second > $MYSQLTEST_VARDIR/tmp/bug16853-2.sql

0 commit comments

Comments
 (0)