diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 13:21:02 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 13:21:02 -0400 |
| commit | fe6e1fc7163cd5e71820082cdd79c1dabe3499e3 (patch) | |
| tree | 23c5d469d26316e4c9b3d0f3de02fc5cdf5ed250 /include | |
| parent | ee3fb5f5e5db20298475787ad3e8609551327435 (diff) | |
| parent | add10a484933c6239dc6aa928cf715e1934980db (diff) | |
| download | mariadb-git-fe6e1fc7163cd5e71820082cdd79c1dabe3499e3.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
sql/tztime.cc:
Auto merged
Diffstat (limited to 'include')
| -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); /* |