client/mysqltest.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged sql/handler.cc: Auto merged