diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-16 03:08:40 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-16 03:08:40 +0300 |
| commit | aff45e1b0733947abde48f712c1af64b4f2549a7 (patch) | |
| tree | bd2eb4ac5dffdd3ac1af40b53a3680a0a9d78195 /libmysql/libmysql.c | |
| parent | 893797be02d4dff2e1aafbdb98ac4e33b9726628 (diff) | |
| parent | 0fc97bc9e5c6c0a4f380841b325f6f0647a90bb5 (diff) | |
| download | mariadb-git-aff45e1b0733947abde48f712c1af64b4f2549a7.tar.gz | |
merge with 4.0
BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
Auto merged
client/client_priv.h:
Auto merged
extra/resolveip.c:
Auto merged
include/mysql.h:
Auto merged
include/thr_alarm.h:
Auto merged
myisam/myisamchk.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_test.cc:
Auto merged
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 4 |
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 |