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 /sql/tztime.cc | |
| 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 '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 |