bzr commit into mysql-5.5 branch (Georgi.Kodinov:3299)

[Georgi Kodinov]

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

 3299 Georgi Kodinov	2011-02-02 [merge]
      merge

    modified:
      mysql-test/t/func_time.test
=== modified file 'mysql-test/t/func_time.test'
--- a/mysql-test/t/func_time.test	2011-02-02 18:13:28 +0000
+++ b/mysql-test/t/func_time.test	2011-02-02 18:16:06 +0000
@@ -816,9 +816,11 @@ SET TIMESTAMP=2147483647; SELECT UTC_TIM
 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
 

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).