diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 13:14:57 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 13:14:57 -0400 |
| commit | add10a484933c6239dc6aa928cf715e1934980db (patch) | |
| tree | b76b47d30b33f51df8172b3d28204a2a0497c7d6 /include/my_time.h | |
| parent | 269ebe54211cf96c4e64fa7268a1414588ca1de8 (diff) | |
| parent | 90112d1175b1043850f50cfae2088dc143e4c62e (diff) | |
| download | mariadb-git-add10a484933c6239dc6aa928cf715e1934980db.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
client/mysqlbinlog.cc:
Auto merged
include/my_time.h:
Auto merged
sql-common/my_time.c:
Auto merged
sql/init.cc:
Auto merged
sql/tztime.cc:
Auto merged
Diffstat (limited to 'include/my_time.h')
| -rw-r--r-- | include/my_time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_time.h b/include/my_time.h index af3fc103530..58995f1bf62 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -95,7 +95,7 @@ long calc_daynr(uint year,uint month,uint day); uint calc_days_in_year(uint year); uint year_2000_handling(uint year); -void init_time(void); +void my_init_time(void); /* |