diff options
| author | unknown <tsmith@rhel5-ia64-a.mysql.com> | 2008-03-27 08:20:25 +0100 |
|---|---|---|
| committer | unknown <tsmith@rhel5-ia64-a.mysql.com> | 2008-03-27 08:20:25 +0100 |
| commit | 45ebe9953385f48f99058eaedf448bb6ff8caeaa (patch) | |
| tree | 1cd9471bfb066e2ed5fdc557a5948b95230098ec /storage/ndb | |
| parent | 27c0540bd8e785499accbd4777bdb5067911cce9 (diff) | |
| parent | 19afc9d9e75b44c01e254300913b716798c40108 (diff) | |
| download | mariadb-git-45ebe9953385f48f99058eaedf448bb6ff8caeaa.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into rhel5-ia64-a.mysql.com:/data0/tsmith/build/51
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/r/drop.result:
SCCS merged
mysql-test/t/drop.test:
SCCS merged
Diffstat (limited to 'storage/ndb')
| -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); |