summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2008-04-03 13:14:57 -0400
committerunknown <cmiller@zippy.cornsilk.net>2008-04-03 13:14:57 -0400
commitadd10a484933c6239dc6aa928cf715e1934980db (patch)
treeb76b47d30b33f51df8172b3d28204a2a0497c7d6 /sql-common
parent269ebe54211cf96c4e64fa7268a1414588ca1de8 (diff)
parent90112d1175b1043850f50cfae2088dc143e4c62e (diff)
downloadmariadb-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 'sql-common')
-rw-r--r--sql-common/my_time.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c
index 543a925681b..23532027883 100644
--- a/sql-common/my_time.c
+++ b/sql-common/my_time.c
@@ -701,9 +701,9 @@ int check_time_range(struct st_mysql_time *my_time, int *warning)
Prepare offset of system time zone from UTC for my_system_gmt_sec() func.
SYNOPSIS
- init_time()
+ my_init_time()
*/
-void init_time(void)
+void my_init_time(void)
{
time_t seconds;
struct tm *l_time,tm_tmp;
@@ -792,7 +792,7 @@ long calc_daynr(uint year,uint month,uint day)
NOTES
The idea is to cache the time zone offset from UTC (including daylight
saving time) for the next call to make things faster. But currently we
- just calculate this offset during startup (by calling init_time()
+ just calculate this offset during startup (by calling my_init_time()
function) and use it all the time.
Time value provided should be legal time value (e.g. '2003-01-01 25:00:00'
is not allowed).