Merge

[awesomized/libmemcached] / src / execute.c

diff --git a/src/execute.c b/src/execute.c
index 11588ad9f69353b4b785acfba50bca0fcdf6f318..e623825c7ac313d615d9da1ba0e4fa347a6ac1bb 100644 (file)
--- a/src/execute.c
+++ b/src/execute.c
@@ -3,6 +3,7 @@
   Return the number of rows set.
 */
 
+#include <stdio.h>
 #include "execute.h"
 
 unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int number_of)
@@ -16,7 +17,7 @@ unsigned int execute_set(memcached_st *memc, pairs_st *pairs, unsigned int numbe
     rc= memcached_set(memc, pairs[x].key, pairs[x].key_length,
                       pairs[x].value, pairs[x].value_length,
                       0, 0);
-    if (rc != MEMCACHED_SUCCESS)
+    if (rc != MEMCACHED_SUCCESS && rc != MEMCACHED_BUFFERED)
       fprintf(stderr, "Failured on insert of %.*s\n", 
               (unsigned int)pairs[x].key_length, pairs[x].key);
     else
@@ -37,11 +38,11 @@ unsigned int execute_get(memcached_st *memc, pairs_st *pairs, unsigned int numbe
   unsigned int retrieved;
 
 
-  for (x= 0; x < number_of; x++)
+  for (retrieved= 0,x= 0; x < number_of; x++)
   {
     char *value;
     size_t value_length;
-    uint16_t flags;
+    uint32_t flags;
     unsigned int fetch_key;
 
     fetch_key= random() % number_of;