Commit d6907923 authored by unknown's avatar unknown

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
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment