merge

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)

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