diff options
| author | cmiller@zippy.cornsilk.net <> | 2008-04-03 13:19:55 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2008-04-03 13:19:55 -0400 |
| commit | 61a528c0b20c0389e0c0d65bee3fe2f40d0d7bd6 (patch) | |
| tree | 71b0dcbca858489706456fd62e9823c65cf37742 /sql/tztime.cc | |
| parent | a296df958167fb44f85487c01cbe51fe7d8a9c9b (diff) | |
| parent | 9ff7a0cedca7b92b5c16f282e52e83460a6d7092 (diff) | |
| download | mariadb-git-61a528c0b20c0389e0c0d65bee3fe2f40d0d7bd6.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
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 b7381e2ed95..709e3b64752 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1035,7 +1035,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 @@ -2757,7 +2757,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 |