diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 13:14:57 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 13:14:57 -0400 |
| commit | add10a484933c6239dc6aa928cf715e1934980db (patch) | |
| tree | b76b47d30b33f51df8172b3d28204a2a0497c7d6 /sql | |
| parent | 269ebe54211cf96c4e64fa7268a1414588ca1de8 (diff) | |
| parent | 90112d1175b1043850f50cfae2088dc143e4c62e (diff) | |
| download | mariadb-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')
| -rw-r--r-- | sql/init.cc | 2 | ||||
| -rw-r--r-- | sql/tztime.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/init.cc b/sql/init.cc index aee0eb7179c..afda36b6b9d 100644 --- a/sql/init.cc +++ b/sql/init.cc @@ -35,7 +35,7 @@ void unireg_init(ulong options) wild_many='%'; wild_one='_'; wild_prefix='\\'; /* Change to sql syntax */ current_pid=(ulong) getpid(); /* Save for later ref */ - init_time(); /* Init time-functions (read zone) */ + my_init_time(); /* Init time-functions (read zone) */ #ifndef EMBEDDED_LIBRARY my_abort_hook=unireg_abort; /* Abort with close of databases */ #endif diff --git a/sql/tztime.cc b/sql/tztime.cc index f080c61e243..1028cfb7c1b 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1034,7 +1034,7 @@ public: return lowest possible my_time_t in case of ambiguity or if we provide time corresponding to the time-gap. - You should call init_time() function before using this function. + You should call my_init_time() function before using this function. RETURN VALUE Corresponding my_time_t value or 0 in case of error @@ -2663,7 +2663,7 @@ main(int argc, char **argv) } printf("gmt_sec_to_TIME = localtime for time_t in [1000000000,1100000000) range\n"); - init_time(); + my_init_time(); /* Be careful here! my_system_gmt_sec doesn't fully handle unnormalized |