into  magare.gmz:/home/kgeorge/mysql/work/valgrind-errs-5.1-opt


tests/mysql_client_test.c:
  manual merge 5.0-opt -> 5.1-opt