summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorunknown <lzhou/zhl@dev3-63.(none)>2007-03-30 16:43:39 +0000
committerunknown <lzhou/zhl@dev3-63.(none)>2007-03-30 16:43:39 +0000
commit6e667aa95d854b186afbe4d7753e9a7438fb8bdc (patch)
tree9425746246f88a44a1394ab2090ef3a012623ee0 /storage
parentfc4c75648dd9941cb3fcd6ada0f6c6d38556ca95 (diff)
parent76678a48e2df70b9ff3ae44e4de9c8c0e9a743e2 (diff)
downloadmariadb-git-6e667aa95d854b186afbe4d7753e9a7438fb8bdc.tar.gz
Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug24793
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug24793 storage/ndb/src/common/transporter/TCP_Transporter.cpp: Auto merged
Diffstat (limited to 'storage')
-rw-r--r--storage/ndb/src/common/transporter/TCP_Transporter.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/ndb/src/common/transporter/TCP_Transporter.cpp b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
index 18171a09974..298e43710b0 100644
--- a/storage/ndb/src/common/transporter/TCP_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
@@ -152,6 +152,8 @@ TCP_Transporter::initTransporter() {
void
TCP_Transporter::setSocketOptions(){
+ int sockOptKeepAlive = 1;
+
if (setsockopt(theSocket, SOL_SOCKET, SO_RCVBUF,
(char*)&sockOptRcvBufSize, sizeof(sockOptRcvBufSize)) < 0) {
#ifdef DEBUG_TRANSPORTER
@@ -166,6 +168,11 @@ TCP_Transporter::setSocketOptions(){
#endif
}//if
+ if (setsockopt(theSocket, SOL_SOCKET, SO_KEEPALIVE,
+ (char*)&sockOptKeepAlive, sizeof(sockOptKeepAlive)) < 0) {
+ ndbout_c("The setsockopt SO_KEEPALIVE error code = %d", InetErrno);
+ }//if
+
//-----------------------------------------------
// Set the TCP_NODELAY option so also small packets are sent
// as soon as possible