merge from ronnie

(This used to be ctdb commit cf23175526d8fde1ef145605fb545584384b6cec)

diff --cc ctdb/tests/ctdbd.sh
index 03897af358d34ae9936b95d587a768a9cba1eeef,03897af358d34ae9936b95d587a768a9cba1eeef..1664a68d639aa13032448283f82cb70066c32fb0
--- 1/ctdb/tests/ctdbd.sh
--- 2/ctdb/tests/ctdbd.sh
+++ b/ctdb/tests/ctdbd.sh
@@@ -3,32 -3,32 +3,32 @@@
  killall -q ctdbd
  
  echo "Starting 2 ctdb daemons"
--bin/ctdbd --nlist direct/nodes.txt
--bin/ctdbd --nlist direct/nodes.txt
++$VALGRIND bin/ctdbd --nlist direct/nodes.txt
++$VALGRIND bin/ctdbd --nlist direct/nodes.txt
  
  echo "Testing ping"
--bin/ctdb_control ping || exit 1
++$VALGRIND bin/ctdb_control ping || exit 1
  
  echo "Testing status"
--bin/ctdb_control status all || exit 1
++$VALGRIND bin/ctdb_control status all || exit 1
  
  echo "Testing statusreset"
--bin/ctdb_control statusreset all || exit 1
++$VALGRIND bin/ctdb_control statusreset all || exit 1
  
  echo "Testing debug"
--bin/ctdb_control debug all 5 || exit 1
--bin/ctdb_control debuglevel || exit 1
--bin/ctdb_control debug all 0 || exit 1
--bin/ctdb_control debuglevel || exit 1
++$VALGRIND bin/ctdb_control debug all 5 || exit 1
++$VALGRIND bin/ctdb_control debuglevel || exit 1
++$VALGRIND bin/ctdb_control debug all 0 || exit 1
++$VALGRIND bin/ctdb_control debuglevel || exit 1
  
  echo "Testing map calls"
--bin/ctdb_control getvnnmap 0 || exit 1
++$VALGRIND bin/ctdb_control getvnnmap 0 || exit 1
  
  echo "Attaching to some databases"
--bin/ctdb_control attach test1.tdb || exit 1
--bin/ctdb_control attach test2.tdb || exit 1
++$VALGRIND bin/ctdb_control attach test1.tdb || exit 1
++$VALGRIND bin/ctdb_control attach test2.tdb || exit 1
  
  echo "Testing getdbmap"
--bin/ctdb_control getdbmap 0 || exit 1
++$VALGRIND bin/ctdb_control getdbmap 0 || exit 1
  
  killall -q ctdbd