bzr commit into mysql-5.1-bugteam branch (kgeorge:2724)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/B39920-merge-5.1-bugteam/ based on
revid:kgeorge@stripped

 2724 Georgi Kodinov	2008-12-01 [merge]
      merged addendum to bug 39920 to 5.1-bugteam
modified:
  .bzr-mysql/default.conf
  mysql-test/r/timezone2.result

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-12-01 15:22:16 +0000
+++ b/.bzr-mysql/default.conf	2008-12-01 15:43:51 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-5.1"
+tree_name = "mysql-5.1-bugteam"

=== modified file 'mysql-test/r/timezone2.result'
--- a/mysql-test/r/timezone2.result	2007-03-09 10:12:31 +0000
+++ b/mysql-test/r/timezone2.result	2008-12-01 15:43:51 +0000
@@ -110,7 +110,7 @@ i	ts
 362793610	1981-07-01 04:00:00
 select from_unixtime(362793609);
 from_unixtime(362793609)
-1981-07-01 03:59:60
[phone]:59:59
 drop table t1;
 create table t1 (ts timestamp);
 set time_zone='UTC';