Commit b8febe60 authored by antirez's avatar antirez
Browse files

Merge branch 'unstable' of github.com:/antirez/redis into unstable

parents f5494b18 6dde56bf
...@@ -2619,8 +2619,11 @@ int processCommand(client *c) { ...@@ -2619,8 +2619,11 @@ int processCommand(client *c) {
if (server.current_client == NULL) return C_ERR; if (server.current_client == NULL) return C_ERR;
/* It was impossible to free enough memory, and the command the client /* It was impossible to free enough memory, and the command the client
* is trying to execute is denied during OOM conditions? Error. */ * is trying to execute is denied during OOM conditions or the client
if ((c->cmd->flags & CMD_DENYOOM) && out_of_memory) { * is in MULTI/EXEC context? Error. */
if (out_of_memory &&
(c->cmd->flags & CMD_DENYOOM ||
(c->flags & CLIENT_MULTI && c->cmd->proc != execCommand))) {
flagTransaction(c); flagTransaction(c);
addReply(c, shared.oomerr); addReply(c, shared.oomerr);
return C_OK; return C_OK;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment