mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

A post-fix for:

Browse source 
MDEV-7254 Assigned expression is evaluated twice when updating column TIMESTAMP NOT NULL
The test type_timestamp failed depending on the build machine time zone.
Setting a fixed time zone for the test.
This commit is contained in:
Alexander Barkov 2015-01-17 16:10:45 +04:00
parent 6164157b3f
commit 252be4c9e7
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/type_timestamp.result
View file

@ -648,6 +648,7 @@ End of 5.5 tests
# #
# MDEV-7254: Assigned expression is evaluated twice when updating column TIMESTAMP NOT NULL # MDEV-7254: Assigned expression is evaluated twice when updating column TIMESTAMP NOT NULL
# #
SET time_zone='+02:00';
create table t1(value timestamp not null); create table t1(value timestamp not null);
set @a:=0; set @a:=0;
create function f1 () returns timestamp create function f1 () returns timestamp
@ -688,4 +689,5 @@ select @a, value from t1;
drop table t1; drop table t1;
drop function f1; drop function f1;
set timestamp=0; set timestamp=0;
SET time_zone=DEFAULT;
End of 10.0 tests End of 10.0 tests

2
mysql-test/t/type_timestamp.test
View file

@ -451,6 +451,7 @@ DROP TABLE t1;
--echo # MDEV-7254: Assigned expression is evaluated twice when updating column TIMESTAMP NOT NULL --echo # MDEV-7254: Assigned expression is evaluated twice when updating column TIMESTAMP NOT NULL
--echo # --echo #
SET time_zone='+02:00';
create table t1(value timestamp not null); create table t1(value timestamp not null);
set @a:=0; set @a:=0;
delimiter //; delimiter //;
@ -489,5 +490,6 @@ select @a, value from t1;
drop table t1; drop table t1;
drop function f1; drop function f1;
set timestamp=0; set timestamp=0;
SET time_zone=DEFAULT;
--echo End of 10.0 tests --echo End of 10.0 tests