mysql-test/r/status.result:
  reverted merging misstake
mysql-test/t/status.test:
  reverted merging misstake