projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge, better error messages
[m6w6/libmemcached]
/
libmemcached
/
strerror.cc
diff --git
a/libmemcached/strerror.cc
b/libmemcached/strerror.cc
index 3688a66bcc678bf50ecd9764fdf4bacedc49ca53..7cd2ff2ffff9b65a861f82699a19597de565b40e 100644
(file)
--- a/
libmemcached/strerror.cc
+++ b/
libmemcached/strerror.cc
@@
-74,8
+74,8
@@
const char *memcached_strerror(memcached_st *, memcached_return_t rc)
case MEMCACHED_WRITE_FAILURE:
return "WRITE FAILURE";
case MEMCACHED_WRITE_FAILURE:
return "WRITE FAILURE";
- case MEMCACHED_
CONNECTION_SOCKET_CREATE_FAILURE: // DEPRECATED
- return "
CONNECTION SOCKET CREATE FAILURE
";
+ case MEMCACHED_
ERROR:
+ return "
ERROR was returned by server
";
case MEMCACHED_DATA_EXISTS:
return "CONNECTION DATA EXISTS";
case MEMCACHED_DATA_EXISTS:
return "CONNECTION DATA EXISTS";
@@
-182,6
+182,12
@@
const char *memcached_strerror(memcached_st *, memcached_return_t rc)
case MEMCACHED_IN_PROGRESS:
return "OPERATION IN PROCESS";
case MEMCACHED_IN_PROGRESS:
return "OPERATION IN PROCESS";
+ case MEMCACHED_SERVER_TEMPORARILY_DISABLED:
+ return "SERVER HAS FAILED AND IS DISABLED UNTIL TIMED RETRY";
+
+ case MEMCACHED_SERVER_MEMORY_ALLOCATION_FAILURE:
+ return "SERVER FAILED TO ALLOCATE OBJECT";
+
default:
case MEMCACHED_MAXIMUM_RETURN:
return "INVALID memcached_return_t";
default:
case MEMCACHED_MAXIMUM_RETURN:
return "INVALID memcached_return_t";