merge

a265fde6 · Georgi Kodinov · 72ae1d65 · 0a8419df · a265fde6 · a265fde6
Commit a265fde6 authored Feb 02, 2011 by Georgi Kodinov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

mysql-test/r/func_time.result mysql-test/r/func_time.result +1 -0

mysql-test/t/func_time.test mysql-test/t/func_time.test +3 -0

No files found.
--- a/mysql-test/r/func_time.result
+++ b/mysql-test/r/func_time.result
@@ -1318,6 +1318,7 @@ SET TIMESTAMP=-1;
 SELECT UTC_TIMESTAMP();
 SET TIMESTAMP=1;
 SELECT UTC_TIMESTAMP();
+SET TIMESTAMP=0;
 End of 5.0 tests
 select date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND);
 date_sub("0050-01-01 00:00:01",INTERVAL 2 SECOND)

--- a/mysql-test/t/func_time.test
+++ b/mysql-test/t/func_time.test
@@ -837,6 +837,9 @@ SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP();
 SET TIMESTAMP=1; SELECT UTC_TIMESTAMP();
 --enable_result_log

+#reset back the timestamp value
+SET TIMESTAMP=0;
+

 --echo End of 5.0 tests