diff options
| author | cmiller@zippy.cornsilk.net <> | 2008-04-03 11:32:00 -0400 |
|---|---|---|
| committer | cmiller@zippy.cornsilk.net <> | 2008-04-03 11:32:00 -0400 |
| commit | 9ff7a0cedca7b92b5c16f282e52e83460a6d7092 (patch) | |
| tree | c831693e16e1a99024c7a4ae4fe1d84087150eca /sql | |
| parent | 3bff5b59c669fa14645fb4705b2406bd2ba0e120 (diff) | |
| download | mariadb-git-9ff7a0cedca7b92b5c16f282e52e83460a6d7092.tar.gz | |
Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3
When linking with some external programs, "multiple definition
of `init_time'"
Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).
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 b3b68926683..2dd2031cdaa 100644 --- a/sql/init.cc +++ b/sql/init.cc @@ -30,7 +30,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 bedbf921cae..2b951c4b061 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 |