summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2003-10-15 21:41:13 +0300
committermonty@mashka.mysql.fi <>2003-10-15 21:41:13 +0300
commit84d9d9807841cbbcb756c24ef56f0d0fe5ec3e2f (patch)
tree1cffa0627ab98f85815d577bb2824198ce5de99b /libmysql
parent4897c6649d927419d95ad9a315dc6316110be2d4 (diff)
downloadmariadb-git-84d9d9807841cbbcb756c24ef56f0d0fe5ec3e2f.tar.gz
Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
Fixed chsize() problem on windows Extend default timeout on windows clients to 1 year (to avoid timeout problems)
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 cd4e8c77f20..d8966b30fb9 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -64,8 +64,8 @@ uint mysql_port=0;
my_string mysql_unix_port=0;
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;
#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS)