Merged trunk.

diff --cc tests/function.c
index f1074697d4853d6f820238376beb1bc629740db1,84a053a4ddc529c000f01105aa6ed74dd238e628..c95d3348ae353d79854b716cad55c2f9db49567c
--- 1/tests/function.c
--- 2/tests/function.c
+++ b/tests/function.c
@@@ -4303,17 -4351,17 +4352,17 @@@ static test_return_t set_udp_behavior_t
  
    memcached_quit(memc);
    memc->number_of_hosts= 0;
 -  run_distribution(memc);
 +  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, memc->distribution);
-   assert(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS);
-   assert(memc->flags & MEM_USE_UDP);
-   assert(memc->flags & MEM_NOREPLY);;
+   test_truth(memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP, 1) == MEMCACHED_SUCCESS);
+   test_truth(memc->flags & MEM_USE_UDP);
+   test_truth(memc->flags & MEM_NOREPLY);;
  
-   assert(memc->number_of_hosts == 0);
+   test_truth(memc->number_of_hosts == 0);
  
    memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_USE_UDP,0);
-   assert(!(memc->flags & MEM_USE_UDP));
+   test_truth(!(memc->flags & MEM_USE_UDP));
    memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NOREPLY,0);
-   assert(!(memc->flags & MEM_NOREPLY));
+   test_truth(!(memc->flags & MEM_NOREPLY));
    return TEST_SUCCESS;
  }