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 /include/mysql.h | |
| 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 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/mysql.h b/include/mysql.h index a8ced90f414..f44d515478c 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -66,6 +66,9 @@ typedef int my_socket; extern unsigned int mysql_port; extern char *mysql_unix_port; +#define CLIENT_NET_READ_TIMEOUT 365*24*3600 /* Timeout on read */ +#define CLIENT_NET_WRITE_TIMEOUT 365*24*3600 /* Timeout on write */ + #ifdef __NETWARE__ #pragma pack(push, 8) /* 8 byte alignment */ #endif |