mysql-test/r/mysqldump.result:
  post-merge fix.
mysql-test/t/mysqldump.test:
  post-merge fix.