diff options
| author | cmiller@zippy.cornsilk.net <> | 2008-04-03 13:19:55 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2008-04-03 13:19:55 -0400 |
| commit | 61a528c0b20c0389e0c0d65bee3fe2f40d0d7bd6 (patch) | |
| tree | 71b0dcbca858489706456fd62e9823c65cf37742 /include | |
| parent | a296df958167fb44f85487c01cbe51fe7d8a9c9b (diff) | |
| parent | 9ff7a0cedca7b92b5c16f282e52e83460a6d7092 (diff) | |
| download | mariadb-git-61a528c0b20c0389e0c0d65bee3fe2f40d0d7bd6.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
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 99eb5c36c6b..014327d6fd8 100644 --- a/include/my_time.h +++ b/include/my_time.h @@ -94,7 +94,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); /* |