r23221: Fix a bad merge, avoid a memory leak and tdb lock problem