summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-10-16 03:08:40 +0300
committermonty@mashka.mysql.fi <>2003-10-16 03:08:40 +0300
commite87c9f5ff8e94ababbed0161101cfd3616d20422 (patch)
treebd2eb4ac5dffdd3ac1af40b53a3680a0a9d78195 /libmysql
parent0d34e50f39e1b7cb14170dabc08f7823cb50a2e9 (diff)
parent4d45ad98b966cf26b8aaf888deed7d1c4c61fc84 (diff)
downloadmariadb-git-e87c9f5ff8e94ababbed0161101cfd3616d20422.tar.gz
merge with 4.0
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/libmysql.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index af39d3228e0..1cad02948e1 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -65,8 +65,8 @@
ulong net_buffer_length=8192;
ulong max_allowed_packet= 1024L*1024L*1024L;
-ulong net_read_timeout= NET_READ_TIMEOUT;
-ulong net_write_timeout= NET_WRITE_TIMEOUT;
+ulong net_read_timeout= CLIENT_NET_READ_TIMEOUT;
+ulong net_write_timeout= CLIENT_NET_WRITE_TIMEOUT;
#ifdef EMBEDDED_LIBRARY