r1011: fix bad merge (from a few months ago) and ensure that we always use tdb_open_l...