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-1.0-115
[m6w6/libmemcached]
/
libmemcached-1.0
/
types
/
return.h
diff --git
a/libmemcached-1.0/types/return.h
b/libmemcached-1.0/types/return.h
index e57442e4079bc6b3b6f3b7d31a01cb2c020f6b08..f4ec9b088a8460804e4b440035574feb0d35231f 100644
(file)
--- a/
libmemcached-1.0/types/return.h
+++ b/
libmemcached-1.0/types/return.h
@@
-47,8
+47,8
@@
enum memcached_return_t {
MEMCACHED_UNKNOWN_READ_FAILURE,
MEMCACHED_PROTOCOL_ERROR,
MEMCACHED_CLIENT_ERROR,
MEMCACHED_UNKNOWN_READ_FAILURE,
MEMCACHED_PROTOCOL_ERROR,
MEMCACHED_CLIENT_ERROR,
- MEMCACHED_SERVER_ERROR,
- MEMCACHED_
CONNECTION_SOCKET_CREATE_FAILURE, // DEPRECATED
+ MEMCACHED_SERVER_ERROR,
// Server returns "SERVER_ERROR"
+ MEMCACHED_
ERROR, // Server returns "ERROR"
MEMCACHED_DATA_EXISTS,
MEMCACHED_DATA_DOES_NOT_EXIST,
MEMCACHED_NOTSTORED,
MEMCACHED_DATA_EXISTS,
MEMCACHED_DATA_DOES_NOT_EXIST,
MEMCACHED_NOTSTORED,
@@
-86,7
+86,8
@@
enum memcached_return_t {
MEMCACHED_IN_PROGRESS,
MEMCACHED_SERVER_TEMPORARILY_DISABLED,
MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE,
MEMCACHED_IN_PROGRESS,
MEMCACHED_SERVER_TEMPORARILY_DISABLED,
MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE,
- MEMCACHED_MAXIMUM_RETURN /* Always add new error code before */
+ MEMCACHED_MAXIMUM_RETURN, /* Always add new error code before */
+ MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE= MEMCACHED_ERROR
};
#ifndef __cplusplus
};
#ifndef __cplusplus