merge

9abc2aad · Georgi Kodinov · fe145b09 · a265fde6 · 9abc2aad
Commit 9abc2aad authored Feb 02, 2011 by Georgi Kodinov
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/mysql-test/t/func_time.test
+++ b/mysql-test/t/func_time.test
@@ -816,9 +816,11 @@ SET TIMESTAMP=2147483647; SELECT UTC_TIMESTAMP();
 SET TIMESTAMP=0; SELECT UTC_TIMESTAMP();
 SET TIMESTAMP=-1; SELECT UTC_TIMESTAMP();
 SET TIMESTAMP=1; SELECT UTC_TIMESTAMP();
-SET TIMESTAMP=0;
 --enable_result_log

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

 --echo End of 5.0 tests