diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 11:32:00 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-03 11:32:00 -0400 |
| commit | 90112d1175b1043850f50cfae2088dc143e4c62e (patch) | |
| tree | c831693e16e1a99024c7a4ae4fe1d84087150eca /sql-common | |
| parent | f20fe94b55727fbc69b1cb86af5dc96f216bdd87 (diff) | |
| download | mariadb-git-90112d1175b1043850f50cfae2088dc143e4c62e.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).
client/mysqlbinlog.cc:
Rename init_time() to my_init_time().
include/my_time.h:
Rename init_time() to my_init_time().
sql-common/my_time.c:
Rename init_time() to my_init_time().
sql/init.cc:
Rename init_time() to my_init_time().
sql/tztime.cc:
Rename init_time() to my_init_time().
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/my_time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c index ecc5aaf8af2..1781251fca1 100644 --- a/sql-common/my_time.c +++ b/sql-common/my_time.c @@ -704,9 +704,9 @@ int check_time_range(struct st_mysql_time *my_time, int *warning) Prepare offset of system time zone from UTC for my_system_gmt_sec() func. SYNOPSIS - init_time() + my_init_time() */ -void init_time(void) +void my_init_time(void) { time_t seconds; struct tm *l_time,tm_tmp; @@ -795,7 +795,7 @@ long calc_daynr(uint year,uint month,uint day) NOTES The idea is to cache the time zone offset from UTC (including daylight saving time) for the next call to make things faster. But currently we - just calculate this offset during startup (by calling init_time() + just calculate this offset during startup (by calling my_init_time() function) and use it all the time. Time value provided should be legal time value (e.g. '2003-01-01 25:00:00' is not allowed). |