mysql-test/r/query_cache.result:
  results moved
sql/sql_cache.cc:
  postmerge fixes