Merge hynda.mysql.fi:/home/my/mysql-5.0-marvel

into  hynda.mysql.fi:/home/my/mysql-5.1-marvel


mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged