client/mysqlbinlog.cc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Cleaned up argument handling for external programs