database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Georgi Kodinov
2011-02-02 20:13:11 +02:00
parent 72ae1d65dd 0a8419dfdd
commit a265fde655
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/func_time.result
View File

@ -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)

3
mysql-test/t/func_time.test
View File

@ -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