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 /client | |
| 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 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index b4086b59c01..f0a4c8d2abf 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -1474,7 +1474,7 @@ int main(int argc, char** argv) DBUG_ENTER("main"); DBUG_PROCESS(argv[0]); - init_time(); // for time functions + my_init_time(); // for time functions parse_args(&argc, (char***)&argv); defaults_argv=argv; |