BitKeeper/etc/ignore:
  Added mysys/test_vsnprintf to the ignore list
mysql-test/mysql-test-run.sh:
  post-merge fix
mysys/my_vsnprintf.c:
  fixed newly introduced bug