mysql-test/r/explain.result:
  Auto merged
mysql-test/t/explain.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged