BitKeeper/deleted/.del-bdb_cache.result:
  Delete: mysql-test/r/bdb_cache.result
BitKeeper/deleted/.del-bdb_cache-master.opt:
  Delete: mysql-test/t/bdb_cache-master.opt
BitKeeper/deleted/.del-bdb_cache.test:
  Delete: mysql-test/t/bdb_cache.test
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_cache.h:
  Auto merged