From 0a62959dd023bdccb5029ca40b23a80478a06c1a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 21 Aug 2001 19:04:31 -0400 Subject: Fix some libmysqld problems. BitKeeper/etc/ignore: Added libmysqld/ha_innobase.cc to the ignore list libmysqld/Makefile.am: Add ha_innobase.cc to libmysqld. libmysqld/lib_sql.cc: Hack to get shutdown working properly in libmysqld. Probably this is not quite correct. sql/mini_client.cc: Remove name collision in embedded libmysqld. --- sql/mini_client.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sql/mini_client.cc') diff --git a/sql/mini_client.cc b/sql/mini_client.cc index 261b1d03f78..d52dc40f6a8 100644 --- a/sql/mini_client.cc +++ b/sql/mini_client.cc @@ -40,6 +40,11 @@ #include "mysqld_error.h" #include "errmsg.h" +#ifdef EMBEDDED_LIBRARY +#define net_read_timeout net_read_timeout1 +#define net_write_timeout net_write_timeout1 +#endif + extern ulong net_read_timeout; extern "C" { // Because of SCO 3.2V4.2 -- cgit v1.2.1