projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170
[m6w6/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index d2ce941ea54147a3cc1ea630f4c18bc5c4e91aae..717ccb698499c550df8824f603d52d456142f2c3 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-34,12
+34,9
@@
*
*/
*
*/
-#include "
mem_config
.h"
+#include "
libtest/yatlcon
.h"
-#include <libtest/common.h>
-
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libtest/common.h"
#include <cassert>
#include <cerrno>
#include <cassert>
#include <cerrno>
@@
-89,7
+86,7
@@
public:
virtual const char *sasl() const
{
virtual const char *sasl() const
{
- return
"-S"
;
+ return
NULL
;
}
const std::string& password() const
}
const std::string& password() const
@@
-210,7
+207,7
@@
bool Memcached::build(size_t argc, const char *argv[])
add_option("-M");
#endif
add_option("-M");
#endif
- if (
_username.size
())
+ if (
sasl
())
{
add_option(sasl());
}
{
add_option(sasl());
}