diff options
| author | unknown <msvensson@shellback.(none)> | 2007-09-22 09:51:54 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2007-09-22 09:51:54 +0200 |
| commit | b1a33149a7cc44b02ebf4de76a5e85592d41a9ad (patch) | |
| tree | d076227c02d7d5f8ac170bf37bf191934691d8e6 /sql/mysql_priv.h | |
| parent | 959dfa7f83d585e2490051ffbf234e954e727b84 (diff) | |
| parent | 150953a36a9fd4985225380f9486788a039c5083 (diff) | |
| download | mariadb-git-b1a33149a7cc44b02ebf4de76a5e85592d41a9ad.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
into shellback.(none):/home/msvensson/mysql/my51-bug30843
BitKeeper/deleted/.del-configure.js:
Auto merged
client/mysql.cc:
Auto merged
client/mysql_upgrade.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/udf.test:
Auto merged
scripts/Makefile.am:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/udf_example.def:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/udf_example.c:
Merge 5.0->5.1
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 375782787a3..527b0368f11 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -327,8 +327,13 @@ protected: #define PRECISION_FOR_DOUBLE 53 #define PRECISION_FOR_FLOAT 24 +/* + Default time to wait before aborting a new client connection + that does not respond to "initial server greeting" timely +*/ +#define CONNECT_TIMEOUT 10 + /* The following can also be changed from the command line */ -#define CONNECT_TIMEOUT 5 // Do not wait long for connect #define DEFAULT_CONCURRENCY 10 #define DELAYED_LIMIT 100 /* pause after xxx inserts */ #define DELAYED_QUEUE_SIZE 1000 |