Commit d6907923 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


sql-common/my_time.c:
  Auto merged
parents d804b33a 3477b50a

sql-common/my_time.c

+1 −1
Original line number Diff line number Diff line
@@ -780,7 +780,7 @@ long calc_daynr(uint year,uint month,uint day) 
*/

my_time_t

my_system_gmt_sec(const MYSQL_TIME *t_src, long *my_timezone,

                  bool *in_dst_time_gap)

                  my_bool *in_dst_time_gap)

{

  uint loop;

  time_t tmp= 0;