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 /sql/tztime.cc | |
| 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 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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 |