Note: [12502], [12503] also address #1794

git-svn-id: file:///svn/toku/tokudb@12506 c7de825b-a66e-492c-adef-691d508d4ae1