fix trigger

Signed-off-by: Shlomi Noach <[email protected]>

go/test/endtoend/onlineddl/vrepl_suite/testdata/tz-datetime-ts-system/create.sql

@@ -1,11 +1,12 @@
 set @original_timezone=@@global.time_zone;
+  set @@global.time_zone='+05:00';
 
 drop table if exists onlineddl_test;
 create table onlineddl_test (
   id int auto_increment,
   i int not null,
   ts0 timestamp default current_timestamp,
-  ts1 timestamp default current_timestamp,
+  dt1 datetime default current_timestamp,
   dt2 datetime,
   t   datetime,
   updated tinyint unsigned default 0,
@@ -26,36 +27,34 @@ create event onlineddl_test
   enable
   do
 begin
-  set @@global.TIME_ZONE='+05:00';
-
   set session time_zone='+02:00';
   insert into onlineddl_test values (null, 7, null, now(), now(), '2010-10-20 10:20:30', 0);
   insert into onlineddl_test values (null, 8, null, now(), now(), now(), 0);
 
   insert into onlineddl_test values (null, 11, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 11 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 11 order by id desc limit 1;
 
   set session time_zone='system';
   insert into onlineddl_test values (null, 13, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 13 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 13 order by id desc limit 1;
   insert into onlineddl_test values (null, 14, null, now(), now(), now(), 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 14 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 14 order by id desc limit 1;
 
   set session time_zone='+00:00';
   insert into onlineddl_test values (null, 17, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 17 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 17 order by id desc limit 1;
   insert into onlineddl_test values (null, 18, null, now(), now(), now(), 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 18 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 18 order by id desc limit 1;
 
   set session time_zone='-03:00';
   insert into onlineddl_test values (null, 19, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 19 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 19 order by id desc limit 1;
 
   set session time_zone='+05:00';
   insert into onlineddl_test values (null, 23, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 23 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 23 order by id desc limit 1;
   insert into onlineddl_test values (null, 24, null, now(), now(), now(), 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 24 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 24 order by id desc limit 1;
 
-  set @@global.TIME_ZONE=@original_timezone;
+  set @@global.time_zone=@original_timezone;
 end ;;

go/test/endtoend/onlineddl/vrepl_suite/testdata/tz-datetime-ts/create.sql

@@ -3,7 +3,7 @@ create table onlineddl_test (
   id int auto_increment,
   i int not null,
   ts0 timestamp default current_timestamp,
-  ts1 timestamp default current_timestamp,
+  dt1 datetime default current_timestamp,
   dt2 datetime,
   t   datetime,
   updated tinyint unsigned default 0,
@@ -27,21 +27,21 @@ begin
   insert into onlineddl_test values (null, 7, null, now(), now(), '2010-10-20 10:20:30', 0);
 
   insert into onlineddl_test values (null, 11, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 11 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 11 order by id desc limit 1;
 
   set session time_zone='system';
   insert into onlineddl_test values (null, 13, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 13 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 13 order by id desc limit 1;
 
   set session time_zone='+00:00';
   insert into onlineddl_test values (null, 17, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 17 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 17 order by id desc limit 1;
 
   set session time_zone='-03:00';
   insert into onlineddl_test values (null, 19, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 19 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 19 order by id desc limit 1;
 
   set session time_zone='+05:00';
   insert into onlineddl_test values (null, 23, null, now(), now(), '2010-10-20 10:20:30', 0);
-  update onlineddl_test set ts2=now() + interval 1 minute, updated = 1 where i = 23 order by id desc limit 1;
+  update onlineddl_test set dt2=now() + interval 1 minute, updated = 1 where i = 23 order by id desc limit 1;
 end ;;