postmerge fix mysql-test/r/query_cache_notembedded.result: postmerge fix mysql-test/t/query_cache_notembedded.test: postmerge fix
notembedded-specific part moved to the new test mysql-test/r/query_cache.result: test result fixed mysql-test/t/query_cache.test: notembedded-only part of the test removed