summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <tim@white.box>2001-08-21 19:05:22 -0400
committerunknown <tim@white.box>2001-08-21 19:05:22 -0400
commit5a8177205cc73996dbde02660cdf6744401a4126 (patch)
treef13b32f036db25092afdd6c6534757e940e75fe4 /sql
parentf1f4bc465fd39632d4a1b5245c19bc4da90ec2b7 (diff)
parent003d978acd505b3db36418f326782dc4ac55b9a7 (diff)
downloadmariadb-git-5a8177205cc73996dbde02660cdf6744401a4126.tar.gz
Merge work.mysql.com:/home/bk/mysql-4.0 into white.box:/home/tim/my/4
Diffstat (limited to 'sql')
-rw-r--r--sql/mini_client.cc5
1 files changed, 5 insertions, 0 deletions
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