projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update tests from trunk
[m6w6/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index 05f43975c2c9134a2f41f86ee92fedbcecaa2583..7d25153fb078c783734bdaa314ce4862f1f51b70 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-22,8
+22,8
@@
#include <libtest/common.h>
#include <libtest/common.h>
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached
-1.0
/memcached.h>
+#include <libmemcached
util-1.0
/util.h>
using namespace libtest;
using namespace libtest;
@@
-98,7
+98,12
@@
public:
memcached_return_t rc= MEMCACHED_SUCCESS;
if (has_socket())
{
memcached_return_t rc= MEMCACHED_SUCCESS;
if (has_socket())
{
- local_pid= libmemcached_util_getpid(socket().c_str(), 0, &rc);
+ if (socket().empty())
+ {
+ return -1;
+ }
+
+ local_pid= libmemcached_util_getpid(socket().c_str(), port(), &rc);
}
else
{
}
else
{