Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1

into  mysql.com:/home/kent/bk/mysql-5.1-build


sql-common/my_time.c:
  Auto merged
This commit is contained in:
unknown 2006-11-29 14:28:05 +01:00
commit e93a20a5fc
31 changed files with 268 additions and 72 deletions

View file

@ -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;