mysql-test/mysql-test-run.pl:
  Post-merge fixes.
  As the merge brings the backport to this version, this was to be expected -
  we really need the handling of this option only once.