diff options
| author | cmiller@zippy.cornsilk.net <> | 2008-04-03 13:14:57 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2008-04-03 13:14:57 -0400 |
| commit | 7e78633f81798068e599cbd467ceb094ef5e5224 (patch) | |
| tree | b76b47d30b33f51df8172b3d28204a2a0497c7d6 /include | |
| parent | eac3a26efab4f3886ba68ed24cc1ddfc453dfa0e (diff) | |
| parent | 9ff7a0cedca7b92b5c16f282e52e83460a6d7092 (diff) | |
| download | mariadb-git-7e78633f81798068e599cbd467ceb094ef5e5224.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
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); /* |