projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge Trond
[m6w6/libmemcached]
/
tests
/
function.c
diff --git
a/tests/function.c
b/tests/function.c
index eba15993b243f7d6827b352146cce9c97a096223..d3b67f0ff4b320f59b6af25bfce78df785e3cafd 100644
(file)
--- a/
tests/function.c
+++ b/
tests/function.c
@@
-2312,6
+2312,7
@@
static test_return user_supplied_bug16(memcached_st *memc)
return 0;
}
return 0;
}
+#ifndef __sun
/* Check the validity of chinese key*/
static test_return user_supplied_bug17(memcached_st *memc)
{
/* Check the validity of chinese key*/
static test_return user_supplied_bug17(memcached_st *memc)
{
@@
-2338,6
+2339,7
@@
static test_return user_supplied_bug17(memcached_st *memc)
return 0;
}
return 0;
}
+#endif
/*
From Andrei on IRC
/*
From Andrei on IRC
@@
-3342,7
+3344,7
@@
static memcached_return poll_timeout(memcached_st *memc)
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, timeout);
memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT, timeout);
- timeout= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT);
+ timeout=
(size_t)
memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_POLL_TIMEOUT);
assert(timeout == 100);
assert(timeout == 100);
@@
-3737,6
+3739,8
@@
static test_return replication_mget_test(memcached_st *memc)
memcached_free(new_clone);
}
memcached_free(new_clone);
}
+ memcached_free(memc_clone);
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}