From 9ff7a0cedca7b92b5c16f282e52e83460a6d7092 Mon Sep 17 00:00:00 2001
From: "cmiller@zippy.cornsilk.net" <>
Date: Thu, 3 Apr 2008 11:32:00 -0400
Subject: 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).
---
 sql/init.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/init.cc')

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
-- 
cgit v1.2.1