Restores files that were automerged during null merge.


mysql-test/r/delete.result:
  Bug#30234: Post-null-merge fix
mysql-test/t/delete.test:
  Bug#30234: Post-null-merge fix