into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0


configure.in:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_cache.cc:
  merge