merge necessary changes from 11131 into main

git-svn-id: file:///svn/mysql/tokudb-engine/src@11136 c7de825b-a66e-492c-adef-691d508d4ae1