diff options
author | unknown <kent@kent-amd64.(none)> | 2008-02-26 18:38:43 +0100 |
---|---|---|
committer | unknown <kent@kent-amd64.(none)> | 2008-02-26 18:38:43 +0100 |
commit | 1113518436ab205e505c8af233d401a393a5cda6 (patch) | |
tree | 059522210811c81c0dbbed66a9bd680518ffa317 /storage | |
parent | 977edd0c8424dd2ee3ab743ef5b6ef16b770bb49 (diff) | |
parent | 1aaa63aabaef8015c71fc6143b3062e197049707 (diff) | |
download | mariadb-git-1113518436ab205e505c8af233d401a393a5cda6.tar.gz |
Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into mysql.com:/home/kent/bk/build/mysql-5.1-build
config/ac-macros/misc.m4:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
Diffstat (limited to 'storage')
-rw-r--r-- | storage/ndb/src/common/util/SocketServer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/ndb/src/common/util/SocketServer.cpp b/storage/ndb/src/common/util/SocketServer.cpp index 51d48ec54f2..47bf562f7d1 100644 --- a/storage/ndb/src/common/util/SocketServer.cpp +++ b/storage/ndb/src/common/util/SocketServer.cpp @@ -112,7 +112,7 @@ SocketServer::setup(SocketServer::Service * service, const int on = 1; if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&on, sizeof(on)) == -1) { - DBUG_PRINT("error",("getsockopt() - %d - %s", + DBUG_PRINT("error",("setsockopt() - %d - %s", errno, strerror(errno))); NDB_CLOSE_SOCKET(sock); DBUG_RETURN(false); |