summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/query_cache/pool_memqcache.c4
-rwxr-xr-xsrc/test/regression/tests/006.memqcache/test.sh1
2 files changed, 1 insertions, 4 deletions
diff --git a/src/query_cache/pool_memqcache.c b/src/query_cache/pool_memqcache.c
index de50729d1..4c55f0fc4 100644
--- a/src/query_cache/pool_memqcache.c
+++ b/src/query_cache/pool_memqcache.c
@@ -2126,9 +2126,7 @@ void
pool_clear_memory_cache(void)
{
size_t size;
- pool_sigset_t oldmask;
- POOL_SETMASK2(&BlockSig, &oldmask);
pool_shmem_lock(POOL_MEMQ_EXCLUSIVE_LOCK);
PG_TRY();
@@ -2148,13 +2146,11 @@ pool_clear_memory_cache(void)
PG_CATCH();
{
pool_shmem_unlock();
- POOL_SETMASK(&oldmask);
PG_RE_THROW();
}
PG_END_TRY();
pool_shmem_unlock();
- POOL_SETMASK(&oldmask);
}
#ifdef USE_MEMCACHED
diff --git a/src/test/regression/tests/006.memqcache/test.sh b/src/test/regression/tests/006.memqcache/test.sh
index e915d8c5d..4b218e197 100755
--- a/src/test/regression/tests/006.memqcache/test.sh
+++ b/src/test/regression/tests/006.memqcache/test.sh
@@ -482,6 +482,7 @@ EOF
exit 1
fi
# make sure query cache has gone
+ $PSQL -t -c "SELECT 1" test # this query processes query cache invalidation request
res1=`$PSQL -t -c "/*FORCE QUERY CACHE*/SELECT current_timestamp" test`
if [ "$res1" = "$res2" ];then
echo "query cache was not invalidated"