diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-08-15 11:52:18 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-08-15 11:52:18 -0600 |
| commit | 771d68b520ae1d1ab86518e07fc27dc77e37428a (patch) | |
| tree | 93a0c46b24c5076645e8d44daccc7f24cf493335 | |
| parent | c53d371cc9ceb8878ce4cae28e82804124340974 (diff) | |
| parent | 083516933412aab29a463ebf50dd2473c72e0705 (diff) | |
| download | mariadb-git-771d68b520ae1d1ab86518e07fc27dc77e37428a.tar.gz | |
bookkeeping
sql/sql_parse.cc:
Auto merged
sql/mysqld.cc:
another bookkeeping commit during merge
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 84bd71dbd9f..2f0845b6997 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -1 +1,2 @@ monty@donna.mysql.com +sasha@mysql.sashanet.com diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 3d903acbfbf..b176d7516fc 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -248,6 +248,7 @@ check_connections(THD *thd) int2store(end+3,thd->server_status); bzero(end+5,13); end+=18; + net->timeout = net_read_timeout; if (net_write_command(net,protocol_version, buff, (uint) (end-buff)) || (pkt_len=my_net_read(net)) == packet_error || |