diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 13:19:55 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 13:19:55 -0400 |
| commit | b36b860edf833869cbc0a0e9f7963740afad33e1 (patch) | |
| tree | 71b0dcbca858489706456fd62e9823c65cf37742 /include | |
| parent | a0d02a942a99461cdc737587244b1db1542e9d7a (diff) | |
| parent | 90112d1175b1043850f50cfae2088dc143e4c62e (diff) | |
| download | mariadb-git-b36b860edf833869cbc0a0e9f7963740afad33e1.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
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 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); /* |