bzr commit into mysql-5.0 branch (Georgi.Kodinov:2900) Bug#52315

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B55755-5.0/ based on revid:georgi.kodinov@stripped

 2900 Georgi Kodinov	2011-02-02
      Bug #52315 part 2 addendum : reset back the timestamp

    modified:
      mysql-test/r/func_time.result
      mysql-test/t/func_time.test
=== modified file 'mysql-test/r/func_time.result'
--- a/mysql-test/r/func_time.result	2011-02-02 16:51:35 +0000
+++ b/mysql-test/r/func_time.result	2011-02-02 18:10:57 +0000
@@ -1340,4 +1340,5 @@ SET TIMESTAMP=-1;
 SELECT UTC_TIMESTAMP();
 SET TIMESTAMP=1;
 SELECT UTC_TIMESTAMP();
+SET TIMESTAMP=0;
 End of 5.0 tests

=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2011-02-02 16:51:35 +0000
+++ b/mysql-test/t/func_time.test	2011-02-02 18:10:57 +0000
@@ -856,5 +856,8 @@ 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


Attachment: [text/bzr-bundle] bzr/[e-mail]