diff options
author | dormando <dormando@rydia.net> | 2023-03-08 12:01:53 -0800 |
---|---|---|
committer | dormando <dormando@rydia.net> | 2023-03-08 13:00:22 -0800 |
commit | 7d6907e659d60512abe7db2154bae039caddee32 (patch) | |
tree | 20a6529f27393a0be41df0d9a81a2fa97c8d56ab | |
parent | 5ed8b5e38d53959f50487d035f86683d18106c62 (diff) | |
download | memcached-1.6.19.tar.gz |
core: fix another dtrace compilation issue1.6.19
-rw-r--r-- | proto_bin.c | 1 | ||||
-rw-r--r-- | proto_text.c | 1 | ||||
-rw-r--r-- | t/proxyconfig.t | 8 |
3 files changed, 4 insertions, 6 deletions
diff --git a/proto_bin.c b/proto_bin.c index 0a30b8a..ef82de0 100644 --- a/proto_bin.c +++ b/proto_bin.c @@ -390,7 +390,6 @@ static void complete_update_bin(conn *c) { c->cas = cas; #ifdef ENABLE_DTRACE - uint64_t cas = ITEM_get_cas(it); switch (c->cmd) { case NREAD_ADD: MEMCACHED_COMMAND_ADD(c->sfd, ITEM_key(it), it->nkey, diff --git a/proto_text.c b/proto_text.c index 94a556f..d316792 100644 --- a/proto_text.c +++ b/proto_text.c @@ -173,7 +173,6 @@ void complete_nread_ascii(conn *c) { ret = store_item(it, comm, c->thread, &cas, c->set_stale); #ifdef ENABLE_DTRACE - uint64_t cas = ITEM_get_cas(it); switch (c->cmd) { case NREAD_ADD: MEMCACHED_COMMAND_ADD(c->sfd, ITEM_key(it), it->nkey, diff --git a/t/proxyconfig.t b/t/proxyconfig.t index ebf8684..299a417 100644 --- a/t/proxyconfig.t +++ b/t/proxyconfig.t @@ -15,15 +15,15 @@ use MemcachedTest; use IO::Select; use IO::Socket qw(AF_INET SOCK_STREAM); +# TODO: possibly... set env var to a generated temp filename before starting +# the server so we can pass that in? +my $modefile = "/tmp/proxyconfigmode.lua"; + if (!supports_proxy()) { plan skip_all => 'proxy not enabled'; exit 0; } -# TODO: possibly... set env var to a generated temp filename before starting -# the server so we can pass that in? -my $modefile = "/tmp/proxyconfigmode.lua"; - # Set up some server sockets. sub mock_server { my $port = shift; |