Skip to content

M
MariaDB
Commit 1a8d63ee authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files
Options

merge

parents 33606525 43b383cb
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
mysql-test/r/func_time.result
View file @ 1a8d63ee
...@@ -1318,6 +1318,7 @@ SET TIMESTAMP=-1; ...@@ -1318,6 +1318,7 @@ SET TIMESTAMP=-1;
SELECT UTC_TIMESTAMP(); SELECT UTC_TIMESTAMP();
SET TIMESTAMP=1; SET TIMESTAMP=1;
SELECT UTC_TIMESTAMP(); SELECT UTC_TIMESTAMP();
SET TIMESTAMP=0;
End of 5.0 tests End of 5.0 tests
select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND); select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND);
date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND) date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND)
......
mysql-test/t/func_time.test
View file @ 1a8d63ee
...@@ -837,6 +837,9 @@ SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP(); ...@@ -837,6 +837,9 @@ SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP();
SET TIMESTAMP=1; SELECT UTC_TIMESTAMP(); SET TIMESTAMP=1; SELECT UTC_TIMESTAMP();
--enable_result_log --enable_result_log
#reset back the timestamp value
SET TIMESTAMP=0;
--echo End of 5.0 tests --echo End of 5.0 tests
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7