projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in bug fix for 456080.
[m6w6/libmemcached]
/
libmemcached
/
flush_buffers.c
diff --git
a/libmemcached/flush_buffers.c
b/libmemcached/flush_buffers.c
index c037cb7b26657d552be83b14c6e77f8aab4f5ee7..649db983ec65295033058e81871126959bc53ac6 100644
(file)
--- a/
libmemcached/flush_buffers.c
+++ b/
libmemcached/flush_buffers.c
@@
-6,7
+6,7
@@
memcached_return_t memcached_flush_buffers(memcached_st *memc)
for (uint32_t x= 0; x < memcached_server_count(memc); ++x)
{
for (uint32_t x= 0; x < memcached_server_count(memc); ++x)
{
- memcached_server_
instance_st *
instance=
+ memcached_server_
write_instance_st
instance=
memcached_server_instance_fetch(memc, x);
if (instance->write_buffer_offset != 0)
memcached_server_instance_fetch(memc, x);
if (instance->write_buffer_offset != 0)
@@
-17,8
+17,11
@@
memcached_return_t memcached_flush_buffers(memcached_st *memc)
WATCHPOINT_ERROR(ret);
return ret;
}
WATCHPOINT_ERROR(ret);
return ret;
}
- if (memcached_io_write(instance, NULL, 0, 1) == -1)
+
+ if (memcached_io_write(instance, NULL, 0, true) == -1)
+ {
ret= MEMCACHED_SOME_ERRORS;
ret= MEMCACHED_SOME_ERRORS;
+ }
}
}
}
}