inintentionally broken during merge 5.5->10.0-base

modified:
  mysql-test/r/mysql_tzinfo_to_sql_symlink.result