diff options
| author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-08-06 06:34:21 -0700 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-08-06 06:34:21 -0700 |
| commit | 9d513b96bceb1a2efb75bdd126e6865b6a54c663 (patch) | |
| tree | 22da4f44a01195015e577c3d8b8eb036bedddee9 /sql/time.cc | |
| parent | 0d69d9f62746b8070e34e2848513b58b79d3689e (diff) | |
| parent | 1f83b351818fca51a14bc34a224c4a80e14c9476 (diff) | |
| download | mariadb-git-9d513b96bceb1a2efb75bdd126e6865b6a54c663.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/work/B29536-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt
sql/field.cc:
Auto merged
sql/time.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
Auto merged
mysql-test/suite/rpl/t/rpl_timezone.test:
Bug 29536 : merge 5.0-opt -> 5.1-opt
Diffstat (limited to 'sql/time.cc')
| -rw-r--r-- | sql/time.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/time.cc b/sql/time.cc index c552d085f5e..a6619cf4cee 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -263,11 +263,11 @@ my_time_t TIME_to_timestamp(THD *thd, const MYSQL_TIME *t, my_bool *in_dst_time_ my_time_t timestamp; *in_dst_time_gap= 0; + thd->time_zone_used= 1; timestamp= thd->variables.time_zone->TIME_to_gmt_sec(t, in_dst_time_gap); if (timestamp) { - thd->time_zone_used= 1; return timestamp; } |