sql/ha_berkeley.cc: Auto merged mysql-test/r/bdb.result: SCCS merged mysql-test/t/bdb.test: SCCS merged